po: merge changes

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

26 files changed, 41251 insertions, 37351 deletions

diff --git a/po/ca.po b/po/ca.po
index 55a309355..d34d214ac 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre3\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2005-09-17 13:40+0200\n"
 "Last-Translator: Josep Puigdemont <josep.puigdemont@gmail.com>\n"
 "Language-Team: Catalan <ca@dodds.net>\n"
@@ -114,29 +114,29 @@ msgstr "torna a llegir la taula de particions"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "aconsegueix la mida en octets"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "%s no es pot obrir"
@@ -215,7 +215,7 @@ msgid "Verifying ... "
 msgstr "S'està verificant... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "No s'ha pogut obrir el fitxer '%s'"
@@ -256,15 +256,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -277,7 +277,7 @@ msgstr "%s de %s\n"
 msgid "cannot stat file %s"
 msgstr "no es pot fer \"stat\" al dispositiu %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -326,8 +326,8 @@ msgid "stat failed: %s"
 msgstr "(Fitxer següent: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "no ha estat possible executar openpty\n"
@@ -561,56 +561,56 @@ msgstr ""
 msgid "compiled without -x support"
 msgstr "%s: compilat sense implementar -x\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcte\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Forma d'ús: %s [-larvsmf] /dev/nom\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s està muntat.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Esteu segur de voler continuar?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "s'ha avortat la comprovació.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Número de zona < FIRSTZONE en el fitxer «%s»."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Número de zona >= ZONES en el fitxer «%s»."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Elimina el bloc"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr ""
 "S'ha produït un error de lectura: no es pot cercar el bloc al fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "S'ha produït un error de lectura: bloc erroni al fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -619,308 +619,308 @@ msgstr ""
 "S'ha produït un error intern: s'està intentant escriure un bloc erroni\n"
 "S'ha ignorat la petició d'escriptura\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "s'ha produït un error en fer una cerca en write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr ""
 "S'ha produït un error d'escriptura: hi ha un bloc incorrecte al fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "s'ha produït un error en fer una cerca en write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "no es pot escriure el superbloc"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "No es pot escriure el mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "No es pot escriure el mapa de zona"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "No es poden escriure els nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "la cerca ha fallat"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "no s'ha pogut assignar memòria intermèdia per als mapes"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "no es pot llegir el superbloc"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "número màgic incorrecte en el superbloc"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Només es suporten blocs o zones de 1k"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Camp s_imap_blocks incorrecte al superbloc"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Camp s_zmap_blocks incorrecte en el superbloc"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr ""
 "No es pot assignar memòria intermèdia per al mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr ""
 "No es pot assignar memòria intermèdia per al mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "No es pot assignar memòria intermèdia per als nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr ""
 "No es pot assignar memòria intermèdia per al nombre de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "No es pot assignar memòria intermèdia per al nombre de zones"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "No es pot llegir el mapa de nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "No es pot llegir el mapa de zones"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "No es poden llegir els nodes d'identificació"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Atenció: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld nodes d'identificació\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocs\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primera zona de dades=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Mida de la zona=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Mida màxima=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estat del sistema de fitxers=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "longitud del nom=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "El node d'identificació %d està marcat com a no usat, però és usat pel "
 "fitxer «%s»\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Marca'l en ús"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "El fitxer «%s» té el mode %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Avís: el nombre de nodes d'identificació és massa gran.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "el node d'identificació arrel no és un directori"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "El bloc ja ha estat emprat anteriorment. Ara està en el fitxer \"%s\"."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Neteja"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "El bloc %d en el fitxer `%s' està marcat com a no usat."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Corregeix"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "El directori `%s' conté un nombre de nodes d'identificació incorrecte per al "
 "fitxer «%.*s»."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Elimina"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: directori incorrecte: «.» no és el primer\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: directori incorrecte: «..» no és el segon\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "error intern"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: directori incorrecte: mida < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "s'ha produït un error en cercar a bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "No s'ha esborrat el mode del node d'identificació %d."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 "El node d'identificació %d no s'usa; s'ha marcat com a usat en el mapa de "
 "bits."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr ""
 "S'està usant el node d'identificació %d; marcat com a en desús en el mapa de "
 "bits."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Estableix"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Node d'identificació %d (mode = %07o), i_nlinks=%d, comptats=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Estableix i_nlinks als comptats"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zona %d: marcada com a en ús; cap fitxer no l'utilitza."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Elimina la marca"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zona %d: en ús, comptada=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zona %d: no en ús, comptada=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "mida de node d'identificació incorrecte"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "mida de node d'identificació v2 incorrecte"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "es necessita un terminal per a reparacions interactives"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "no es pot obrir '%s'"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s està net; no es comprova.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "S'està forçant la comprovació del sistema de fitxers a %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Hi ha elements estranys al sistema de fitxers %s, s'ha de comprovar.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -929,12 +929,12 @@ msgstr ""
 "\n"
 "%6ld nodes d'identificació usats (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones usades (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -957,7 +957,7 @@ msgstr ""
 "------\n"
 "%6d fitxers\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1081,7 +1081,7 @@ msgstr "massa nodes d'identificació; el màxim és de 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "no hi ha prou espai, com a mínim es necessiten %lu blocs"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositiu: %s\n"
@@ -1253,10 +1253,8 @@ msgstr "%6.2f%% (%+d octets)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"S'ha produït un error en tancar el fitxer\n"
+msgid "cannot close file %s"
+msgstr "No s'ha pogut obrir el fitxer '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1367,89 +1365,99 @@ msgstr ""
 "AVÍS: els nombres de dispositiu es trunquen a %u bits. És gairebé segur que\n"
 "això provocarà que alguns dispositius de fitxers siguin erronis.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Forma d'ús: %s [-c | -l nom_fitxer] [-nXX] [-iXX] /dev/nom [blocs]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s ja està muntat; no s'hi crearà cap sistema de fitxers."
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "s'ha produït un error en cercar el bloc d'arrencada a write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "no s'ha pogut netejar el sector d'arrencada"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "s'ha produït un error en cercar a write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "no es pot escriure el superbloc"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "no s'ha pogut escriure el mapa dels nodes d'identificació"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "no s'ha pogut escriure el mapa de zones"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "no s'ha pogut escriure els nodes d'identificació"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "s'ha produït un error en fer una cerca en write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "no s'ha pogut escriure a write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "hi ha massa blocs incorrectes"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "no hi ha prou blocs correctes"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "no s'ha pogut assignar memòria intermèdia per als mapes"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "no s'ha pogut assignar memòria intermèdia per als mapes"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr ""
 "no s'ha pogut assignar memòria intermèdia per als nodes d'identificació"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld nodes d'identificació\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blocs\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1458,99 +1466,99 @@ msgstr ""
 "Mida_màx.=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "no s'ha pogut cercar durant la comprovació de blocs"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Hi ha valors estranys a do_check: probablement hi ha errors\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "no s'ha pogut cercar a check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "blocs incorrectes abans de l'àrea de dades: no s'ha pogut crear el sistema "
 "de fitxers"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocs incorrectes\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "un bloc incorrecte\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "no es pot obrir el fitxer de blocs incorrectes"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "No s'ha pogut llegir la unitat de disc"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "mida de node d'identificació incorrecte"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "error a strtol: no s'han especificat el nombre de blocs"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "la cerca ha fallat"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "no ha estat possible executar openpty\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: dispositiu ocupat"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "no s'intentarà crear cap sistema de fitxers a '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Nombre de sectors"
@@ -1893,7 +1901,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "s'ha produït un error en cercar a write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2238,7 +2246,7 @@ msgid "   Logical"
 msgstr "   Lògica"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Desconegut"
 
@@ -2905,13 +2913,13 @@ msgstr "Ordre d'etiqueta de disc BSD (m per a l'ajuda): "
 
 # Parla d'etiquetes, segurament és femení
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Primera %s"
 
 # Parla d'etiquetes, segurament és femení
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Última %s o +mida o +midaM o +midaK"
@@ -3060,7 +3068,7 @@ msgid "tracks/cylinder"
 msgstr "pistes/cilindre"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cilindres"
 
@@ -3130,12 +3138,12 @@ msgstr "S'ha creat el màxim nombre de particions\n"
 msgid "This partition already exists.\n"
 msgstr "Aquesta partició ja existeix.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Avís: hi ha massa particions (%d, el màxim són %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3340,7 +3348,7 @@ msgstr "Heu de definir els"
 msgid "heads"
 msgstr "capçals"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sectors"
 
@@ -3776,7 +3784,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Arrenc.   Inici         Final    Blocs    Id  Sistema\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Dispositiu"
 
@@ -3860,7 +3868,7 @@ msgstr "El total de sectors assignats %d supera el màxim de %lld\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld sectors no assignats\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -4018,39 +4026,39 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "S'estan sincronitzant els discs.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partició %d no té cap àrea de dades\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nou començament de dades"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Ordre d'expert (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Nombre de cilindres"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Nombre de capçals"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Nombre de sectors"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Avís: s'està establint el desplaçament del sector per a la compatibilitat "
 "amb DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4059,33 +4067,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, 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:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "no es pot obrir %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ordre desconeguda\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Aquest nucli troba la mida del sector automàtiament; s'ignorarà l'opció -b\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4094,18 +4102,18 @@ msgstr ""
 "Avís: l'opció -b (estableix la mida del sector) s'ha d'usar amb un "
 "dispositiu específic\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "En entrar el mode d'etiqueta, s'ha detectat una etiqueta de disc OSF/1 en "
 "%s.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Ordre (m per a obtenir ajuda): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4114,16 +4122,16 @@ msgstr ""
 "\n"
 "L'actual fitxer d'arrencada és: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Entreu el nom del nou fitxer d'arrencada: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No s'ha modificat el fitxer d'arrencada\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4449,9 +4457,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tHeu escollit un nom de fitxer d'arrencada inusual.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Podeu canviar l'etiqueta de les particions no buides.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Només el superusuari port canviar el rellotge del sistema.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4467,7 +4475,7 @@ msgstr ""
 "Només l'entrada de disc sencer \"Volum SGI\" pot infringir això.\n"
 "Escriviu SÍ si esteu segur que voleu tornar a etiquetar aquesta partició.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "SÍ\n"
 
@@ -4674,7 +4682,7 @@ msgstr "Buit no usat - sectors 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Buit no usat - sectors %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4683,7 +4691,7 @@ msgstr ""
 "Altres particions cobreixen el disc sencer.\n"
 "Abans de tornar-hi esborreu-ne o reduïu-ne la seva mida.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4692,12 +4700,12 @@ msgstr ""
 "Es recomana especialment que la onzena partició\n"
 "cobreixi el disc sencer i sigui del tipus 'volum SGI'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4708,7 +4716,7 @@ msgstr ""
 "valor %d %s encavalca amb d'altres particions. S'ha canviat l'entrada\n"
 "per %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4717,7 +4725,7 @@ msgstr ""
 "Si desitgeu mantenir la compatibilitat amb SunOS/Solaris, considereu deixar\n"
 "aquesta partició com a Disc sencer (5), començant en 0, amb %u sectors\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4732,7 +4740,7 @@ msgstr ""
 "amb el 82 (Linux d'intercanvi): "
 
 # FIXME
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4752,7 +4760,7 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4765,29 +4773,29 @@ msgstr ""
 "Unitats = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Senyal.  Inici      Final   Blocs   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cilindres alternatius"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Sectors addicionals per cilindre"
 
 # FIXME
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Factor d'entrellaçat"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Velocitat de rotació (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Nombre de cilindres físics"
 
@@ -5254,7 +5262,7 @@ msgstr "Disc %s: no s'ha pogut obtenir la geometria\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disc %s : no s'ha pogut obtenir la mida.\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5265,22 +5273,22 @@ msgstr ""
 "No té sentit que hi executeu fdisk.[Useu l'opció --force si realment ho "
 "desitgeu.]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Avís: HDIO_GETGEO indica que hi ha %lu capçals\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Avís: HDIO_GETGEO indica que hi ha %lu sectors\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Avís: HDIO_GETGEO indica que hi ha %lu cilindres\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5289,7 +5297,7 @@ msgstr ""
 "Avís: el nombre de sectors és improbable (%lu); normalment com a molt 63\n"
 "Això donarà problemes amb el programari que usi adreces C/H/S\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5298,7 +5306,7 @@ msgstr ""
 "\n"
 "Disc %s: %lu cilindres, %lu capçals, %lu sectors/pista\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5306,7 +5314,7 @@ msgstr ""
 "%s de partició %s té un valor impossible per al capçal: %lu (hauria d'estar "
 "entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5315,7 +5323,7 @@ msgstr ""
 "%s de partició %s té un valor impossible per al sector: %lu (hauria d'estar "
 "entre 1 i %lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5324,7 +5332,7 @@ msgstr ""
 "%s de partició %s té un valor impossible per als cilindres: %lu (hauria "
 "d'estar entre 0 i %lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5333,12 +5341,12 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "S'està rellegint la taula de particions...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5348,26 +5356,26 @@ msgstr ""
 "L'ordre per a tornar a llegir la taula de particions ha fallat\n"
 "Torneu a iniciar el sistema ara, abans d'usar mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "S'ha produït un error en tancar %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: aquesta partició no existeix\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "format no reconegut; s'està usant els sectors\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format no implementat; s'està usant %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5376,12 +5384,12 @@ msgstr ""
 "Unitats = cilindres de %lu octets, blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp. Arr.  Inici     Final #cil.    #blocs    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5390,12 +5398,12 @@ msgstr ""
 "Unitats = sectors de 512 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp. Arr      Inici       Final #sectors  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5404,12 +5412,12 @@ msgstr ""
 "Unitats = blocs de 1024 octets, contant des de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp. Arr.    Inici       Final   #blocs   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5419,33 +5427,33 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp. Arr.  Inici   Final  MiB    #blocs    Id. sistema\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, 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:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfinal: (cil.,capç.,sect.) esperat (%ld,%ld,%ld) trobat (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partició acaba en el cilindre %ld, més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "No s'han trobat particions\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5456,51 +5464,41 @@ msgstr ""
 "  per a C/H/S=*/%ld/%ld (en comptes de %ld/%ld/%ld).\n"
 "Per a aquest llistat s'assumirà aquesta geometria.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "no hi ha cap taula de particions.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "és estrany, només hi ha definides %d particions.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Avís: la partició %s té una mida 0 però no està marcada com a buida\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Avís: la partició %s té una mida 0 i és arrencable\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Avís: la partició %s té una mida 0 i no comença en zero\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Avís: la partició %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "no està contingut a dins de la partició %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Avís: les particions %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "i %s encavalquen\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Avís: la partició %d està buida\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5509,17 +5507,17 @@ msgstr ""
 "Avís: la partició %s conté part de la taula de particions\n"
 "(sector %lu) i la destruirà quan s'ompli\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Avís: la partició %s comença en el sector 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Avís: la partició %s s'extén més enllà del final del disc\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5527,17 +5525,17 @@ msgstr ""
 "Entre les particions primàries, almenys una pot ser estesa\n"
 " (encara que això no és un problema en Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Avís: la partició %s no comença al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Avís: la partició %s no acaba al límit d'un cilindre\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5546,7 +5544,7 @@ msgstr ""
 "Això no és problema per al LILO, però l'MBR del DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5554,7 +5552,7 @@ msgstr ""
 "Avís: normalment només es pot arrencar des de particions primàries.\n"
 "El LILO no tindrà en compte el senyalador d'«arrencada».\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5563,11 +5561,11 @@ msgstr ""
 "Això no és problema per al LILO, però el MBR de DOS no arrencarà aquest "
 "disc.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "inici"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5575,24 +5573,24 @@ msgstr ""
 "partició %s: inici: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trobat "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "final"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partició %s: final: (cil.,capç.,sect.) s'esperava (%ld,%ld,%ld) s'ha trobat "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, 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à del final del disc\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5601,7 +5599,7 @@ msgstr ""
 "Avís: s'ha desplaçat l'inici de la partició estesa de %ld a %ld\n"
 "(Només per al llistat, no en canvia el contingut.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5609,135 +5607,135 @@ msgstr ""
 "Avís: la partició estesa no comença al límit d'un cilindre.\n"
 "El DOS i Linux interpretaran el contingut de manera diferent.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "hi ha massa particions - s'ignoraran les posteriors a la: (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "l'arbre de particions?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "s'ha detectat el gestor de disc - no s'ha pogut gestionar\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "s'ha trobat una signatura DM6 - s'està deixant còrrer\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estrany..., una partició estesa de mida 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estrany..., una partició BSD de mida 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: no s'ha pogut reconèixer el tipus de la taula de particions\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "s'ha especificat el senyalador -n: No s'ha canviat res\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "No s'ha pogut desar els sector antics - s'està avortant\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "línia d'entrada llarga o incompleta - s'està sortint\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 "s'ha produït un error en l'entrada: s'esperava `=' després del camp %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 "s'ha produït un error en l'entrada: no s'esperava el caràcter %c després del "
 "camp %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "no s'ha pogut reconèixer l'entrada: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "el nombre és massa gran\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "dades estranyes després del nombre\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "no hi ha espai per al descriptor de partició\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "no s'ha pogut crear una partició estesa adjunta\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "hi ha massa camps a l'entrada\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "No queda més espai\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Tipus no permès\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Avís: la mida indicada (%lu) excedeix la màxima acceptable (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Avís: partició buida\n"
 
 # DUBTE
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Avís: l'inici de la partició no és correcte (mínim %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "no s'ha pogut reconèixer el senyalador d'arrencada - escolliu - o *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "especificació parcial de c,h,s?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "La partició estesa no és on s'esperava\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "entrada dolenta\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "hi ha massa particions\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5748,99 +5746,181 @@ msgstr ""
 "<inici> <mida> <tipus [E,S,L,X,hex]> <arrencable [-,*]> <c,h,s> <c,h,s>\n"
 "Normalment només cal especificar <inici> i <mida> (i potser <tipus>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+msgstr "Forma d'ús:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "dispositiu: semblant a /dev/hda o /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d particions:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "opcions perilloses:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [o --show-pt-geometry]: Imprimeix la geometria que s'ha endevinat\n"
+"                               partir de la taula de particions"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [o --show-extended]:  També llista les particions esteses a la "
+"sortida\n"
+"                             o els descriptors esperats en l'entrada"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Forma d'ús:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, 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:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s dispositiu n1 n2 ... activa particions n1 ..., desactiva la resta\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, 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:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5849,62 +5929,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Useu el senyalador --force per a obviar totes les comprovacions.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "cap ordre?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu blocs\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "forma d'ús: sfdisk --print-id dispositiu número_partició\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "forma d'ús: sfdisk --change-id dispositiu número_partició Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "forma d'ús: sfdisk --id dispositiu partició_número [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "només podeu especificar un dispositiu (excepte amb -l o -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "no es pot obrir %s per a lectura-escriptura\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "no es pot obrir %s per a lectura\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, 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:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "No s'ha pogut obtenir la mida de %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, 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:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5912,7 +5992,7 @@ msgstr ""
 "Fet\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5921,36 +6001,36 @@ msgstr ""
 "Teniu %d particions primàries actives. Això no és important per al LILO,\n"
 "però l'MBR del DOS només pot arrencar discs amb una partició activa.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, 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:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador dolent %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Aquest disc està actualment en ús.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "S'ha produït un error fatal: no s'ha pogut trobar %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Avís: %s no és un dispositiu de blocs\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "S'està comprovant que en aquest moment ningú estigui usant aquest disc...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5963,30 +6043,30 @@ msgstr ""
 "swapoff en totes les particions d'intercanvi del disc.\n"
 "Useu el senyalador --no-reread per a suprimir aquesta comprovació.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Useu el senyalador --force per a obviar totes les comprovacions.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "Correcte\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Antiga situació:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partició %d no existeix; no s'ha pogut canviar\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Nova situació:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5994,21 +6074,21 @@ msgstr ""
 "Aquestes particions no em semblen bé - no s'ha canviat res.\n"
 "(Si realment desitgeu fer això, useu l'opció --force).\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "No em sembla bé - probablement hagueu de respondre No\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Esteu satisfet amb això? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Desitgeu escriure això al disc? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -6017,17 +6097,17 @@ msgstr ""
 "\n"
 "sfdisk: final prematur de l'entrada\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "S'està sortint - no s'ha canviat res\n"
 
 # FIXME: 'y', 'n', 'q'. Are they translatable?
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Respongueu amb una: y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6036,7 +6116,7 @@ msgstr ""
 "S'ha escrit correctament la nova taula de particions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6068,101 +6148,103 @@ msgstr "S'estan sincronitzant els discs.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s s'ha completat amb èxit.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "la cerca ha fallat"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: no s'ha pogut obrir %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: no s'ha trobat"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: s'ha produït un error %d en descomprimir! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s no és un dispositiu lp.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "S'està forçant la comprovació del sistema de fitxers a %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6170,58 +6252,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s no és un dispositiu lp.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s desmuntat\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "S'està desmuntant els sistemes de fitxers restants..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "S'està desmuntant els sistemes de fitxers restants..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: argument desconegut: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6238,33 +6320,82 @@ msgstr "opció llarga buida després de l'argument -l o --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "intèrpret d'ordres desconegut després de l'argument -s o --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [opcions] -o|--options cadena_opcions [opcions] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Permet opcions llargues amb només un -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Aquesta petita guia d'ús\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=opc_llarg   Opcions llargues a reconèixer\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=nom_programa      El nom amb el que s'informa dels errors\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=cadena_opcions Opcions curtes a reconèixer\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Inhabilita els informes d'error mitjançant\n"
+"                               getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
 msgstr ""
+"  -s, --shell=intèrpret_ordres Estableix els mateixos convenis quant a les\n"
+"                               cometes que l'interpret d'ordres indicat\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Prova la versió del getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 No es posarà la sortida entre cometes\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Mostra la informació de la versió\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "falta l'argument cadena_opcions"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "s'ha produït un error intern; contacteu amb l'autor."
 
@@ -6740,91 +6871,109 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "No es pot establir el valor d'època en el nucli.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d particions:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                Indica al RTC el tipus d'Alpha que teniu (vegeu hwclock(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "No es pot establir el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s no admet arguments que no siguin opcions. Heu especificat %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6833,7 +6982,7 @@ msgstr ""
 "Heu especificat múltiples funcions.\n"
 "Només podeu fer-ne una a la vegada.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6842,7 +6991,7 @@ msgstr ""
 "%s: Les opcions --utc i --localtime s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6851,7 +7000,7 @@ msgstr ""
 "%s: Les opcions --adjust i --noadjfile s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6860,28 +7009,28 @@ msgstr ""
 "%s: Les opcions --adjust i --noadjfile s'exclouen mútuament. Les heu "
 "especificat totes dues.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: Amb --noadjfile, haureu d'especificar --utc o --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 "L'hora indicada per establir no és usable. No s'ha tocat el rellotge.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Només el superusuari pot canviar el rellotge del maquinari.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Només el superusuari port canviar el rellotge del sistema.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6889,14 +7038,14 @@ msgstr ""
 "Només el superusuari pot canviar el valor de l'època del rellotge del "
 "maquinari en el nucli.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "No s'ha pogut accedir al rellotge del maquinari mitjançant cap dels mètodes "
 "coneguts.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7084,7 +7233,7 @@ msgid "failed to read mtab"
 msgstr "no es pot fer stat per a %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
@@ -7126,72 +7275,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: no ha estat possible muntar"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
@@ -7278,7 +7467,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: PAM ha fallat; s'està avortant: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Contrasenya: "
 
@@ -7736,47 +7925,48 @@ msgstr "MASSA salts de pàgina"
 msgid "too many bare linefeeds."
 msgstr "massa salts de pàgina solitaris.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "S'ha excedit el temps d'espera per a l'entrada al cap de %d segons.\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Última entrada: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "des de %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "a %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "S'ha produït un error en obrir %s"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "HA FALLAT L'ENTRADA DE %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "HA FALLAT L'ENTRADA A %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "HA FALLAT %d VEGADES L'ENTRADA DES DE %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "HA FALLAT %d VEGADES L'ENTRADA A %s, %s"
@@ -7806,7 +7996,7 @@ msgstr "mount: s'ha denegat el permís"
 msgid "setuid failed"
 msgstr "setuid() ha fallat"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "no s'ha pogut executar exec\n"
@@ -7851,8 +8041,8 @@ msgstr "%s: No s'ha pogut establir el context per a %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: no s'ha pogut desblocar %s: %s (els canvis encara estan a %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "no s'ha pogut bifurcar\n"
@@ -7907,24 +8097,21 @@ msgstr "el valor de l'any no és legal: utilitzeu 1-9999"
 msgid "%s %d"
 msgstr "%2$d de %1$s"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "forma d'ús: cal [-13smjyV] [[mes] any]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -8036,32 +8223,32 @@ msgstr " Elimina"
 msgid "failed to add line to output"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "s'ha produït un error en cercar"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: no s'ha pogut llegir %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8072,91 +8259,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Ordres disponibles:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "No hi ha cap directori %s\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
@@ -8181,12 +8393,12 @@ msgstr "%s: no s'ha pogut trobar el procés \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: senyal desconegut %s; senyals vàlids:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "forma d'ús: %s [ -s senyal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ senyal ]\n"
@@ -8206,84 +8418,83 @@ msgstr "MidaBloc: %d\n"
 msgid "connect %s"
 msgstr "connexió nfs"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "connector nfs"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "connexió nfs"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Fitxer següent: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "El valor està fora del rang.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: no es coneix el nom de la facilitat: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: nom amb prioritat desconeguda: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8421,7 +8632,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8439,12 +8650,13 @@ msgstr "%s: s'ha produït un error en obrir: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8452,7 +8664,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8475,40 +8687,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "S'han obtingut %d octets de %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "no s'ha pogut executar exec\n"
@@ -8528,24 +8740,12 @@ msgstr "no es pot fer \"stat\" al dispositiu %s"
 msgid "%s - No such file or directory\n"
 msgstr "el node d'identificació arrel no és un directori"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "forma d'ús: namei [-mx] camí [camí ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d particions:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8557,19 +8757,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "argument --date massa llarg\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8579,169 +8778,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: no s'ha pogut reanomenar %s a %s: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argument -l incorrecte %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Escriu"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "s'ha llegit %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "no es pot fer stat per a %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "No s'ha pogut obrir %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "No s'ha pogut obrir %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "s'ha produït un error en llegir %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "identificador invàlid"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "identificador invàlid"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: valor incorrecte\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8749,29 +8946,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8807,43 +9003,44 @@ msgid "%s: write failed"
 msgstr "no ha estat possible executar openpty\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "octets"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8941,63 +9138,63 @@ msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "no s'ha pogut tornar a nomenar %s per %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: l'usuari \"%s\" no existeix.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", desplaçament %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", límit de mida %lld"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", xifratge %s (tipus %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", desplaçament %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipus de xifratge %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: no s'ha pogut obtenir informació sobre el dispositiu %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: no teniu permisos per llegir /dev/loop#"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: no s'ha trobat cap dispositiu loop lliure"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -9007,58 +9204,56 @@ msgstr ""
 "       no reconegui els dispositius loop? (Si es així, recompileu-lo o feu\n"
 "       «modprobe loop».)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr ""
 "S'ha esgotat la memòria en augmentar la mida de la memòria intermèdia.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "El sector %d ja està assignat\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "mount: %s%s està protegit contra escriptura; es muntarà en només lectura"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No s'ha pogut blocar en memòria, s'està sortint.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): èxit\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): èxit\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: no s'ha pogut suprimir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Aquest mount s'ha compilat sense suport per a loop. Recompileu-lo.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9066,7 +9261,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "forma d'ús:\n"
 "  %s dispositiu_loop                                   # dona informació\n"
@@ -9074,48 +9269,45 @@ msgstr ""
 "  %s -f                                                # cerca no usats\n"
 "  %s [ -e xifratge ] [ -o desplaçament ] {-f|disp_loop} fitxer # configura\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no s'ha pogut obrir el dispositiu %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositiu ocupat"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9676,165 +9868,168 @@ msgstr "s'ha produït un error en la crida xstrndup"
 msgid "not enough memory"
 msgstr "no hi ha prou memòria"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: No s'esperava EOF en el fitxer %s\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "no s'ha pogut executar exec\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ha fallat"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "S'ha produït un error en obrir %s"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Nom"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: avís: %s té els permisos %04o que són insegurs, se suggereix %04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 "%s: avís: %s té els permisos %04o que són insegurs, se suggereix %04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: S'està ometent el fitxer %s - sembla que té forats.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s a %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "No sou el superusuari.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "la cerca ha fallat"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10110,7 +10305,7 @@ msgstr "Atenció: s'estan suprimint les particions després de %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "Atenció: s'estan suprimint les particions després de %d\n"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10170,19 +10365,13 @@ msgstr "   p   imprimeix la taula de particions BSD"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "El disc %s no conté una taula de particions vàlida\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10193,47 +10382,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Ordres disponibles:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "No s'ha pogut assignar la memòria temporal.\n"
@@ -10361,7 +10549,7 @@ msgstr "No s'ha pogut escriure la partició a %s\n"
 msgid "failed to set pid %d's policy"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
@@ -10635,7 +10823,7 @@ msgstr "%s: %ld el llindar i %ld el temps d'espera per defecte\n"
 msgid "Can't set signal handler"
 msgstr "No s'ha pogut determinar el gestor de senyals"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "no ha estat possible executar gettimeofday"
 
@@ -10644,7 +10832,7 @@ msgstr "no ha estat possible executar gettimeofday"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "No s'ha pogut emetre CYGETMON a %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10652,12 +10840,12 @@ msgstr ""
 "%s: %lu enters, %lu/%lu caràcters; fifo: %lu llindar, %lu temps_espera, %lu "
 "màxim, %lu ara\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f enters/seg.; %f rebut, %f enviat (caràcters/seg.)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10665,7 +10853,7 @@ msgstr ""
 "%s: %lu enters, %lu caràcters; fifo: %lu llindar, %lu temps_espera, %lu "
 "màxim, %lu ara\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f enters/seg.; %f rebut (caràcters/seg.)\n"
@@ -10757,124 +10945,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Ordre desconeguda: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "No hi ha cap directori %s\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "no s'ha pogut fer fsync"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Fitxer següent: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "cap ordre?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "no s'ha pogut fer fsync"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10882,43 +11053,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Massa arguments.\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valor establert invàlid: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "màx. nombre de segments = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "no ha estat possible executar openpty\n"
@@ -10926,100 +11097,100 @@ msgstr "no ha estat possible executar openpty\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s requereix un argument\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: no s'ha pogut obrir %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: valor incorrecte\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "no s'ha pogut bifurcar\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "la cerca ha fallat"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "el node d'identificació arrel no és un directori"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "no ha estat possible executar openpty\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "no ha estat possible executar openpty\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11028,101 +11199,92 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "No s'ha especificat l'opció --date.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "el node d'identificació arrel no és un directori"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "no ha estat possible executar openpty\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "S'ha canviat la informació del finger.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Segment de la memòria compartida shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "Cua de missatges msqid=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "semàfors assignats = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11623,8 +11785,8 @@ msgstr ""
 "Segment de la memòria compartida shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11633,8 +11795,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "octets=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11667,8 +11829,8 @@ msgstr ""
 "Cua de missatges msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11701,8 +11863,8 @@ msgstr ""
 "semid de la matriu del semàfor=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11750,71 +11912,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador invàlid"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id invàlid : %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositiu de bloc especial"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "no es pot obtenir la mida de %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No s'ha pogut cercar a la unitat de disc"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "no es pot obtenir la mida de %s"
@@ -11971,48 +12131,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "el node d'identificació arrel no és un directori"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s està muntat.\t "
@@ -12047,55 +12202,50 @@ msgstr ""
 "\t -n           inhabilita la detecció automàtica de l'ordre dels octets\n"
 "\t -V           mostra la versió i surt\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: s'ha produït un error en escriure %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Passa de probes: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): línia del mapa incorrecta\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: no s'ha pogut trobar \"_stext\" a %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 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:400
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12104,240 +12254,231 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Ordre desconeguda: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "valor d'expiració erroni: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "usuari"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "No s'ha pogut escriure la partició a %s\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: prioritat antiga %d, nova prioritat %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "no ha estat possible executar gettimeofday"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "semàfors assignats = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr ""
 "\n"
 "S'ha produït un error en tancar el fitxer\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "la cerca ha fallat"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "semàfors assignats = %d\n"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "no ha estat possible executar gettimeofday"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: no s'ha pogut reconèixer el tipus de la taula de particions\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: s'ha produït un error en obrir: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Usant %s.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Usant %s.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s no és un dispositiu lp.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Missatge de %s@%s el %s a les %s ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Missatge de %s@%s el %s a les %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Fitxer següent: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12388,17 +12529,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr "Escolliu `getopt --help' per obtenir més informació.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: no s'ha pogut reconèixer el tipus de la taula de particions\n"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "Massa arguments.\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "No s'ha pogut escriure la partició a %s\n"
@@ -12485,173 +12626,171 @@ msgstr "%s està usant la IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s està usant escrutini\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "forma d'ús: %s programa [arg ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "la cerca ha fallat"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: no s'ha pogut executar %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "s'ha produït un error en canviar el mode de %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: no s'ha pogut trobar el procés \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: no s'ha pogut executar %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "No s'ha pogut assignar la memòria temporal.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "valor d'expiració erroni: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Massa arguments.\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "No s'ha pogut assignar la memòria temporal.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "velocitat incorrecta: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "massa velocitats alternatives"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: no es pot obrir com a entrada estàndard: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: no és un dispositiu de caràcter"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: no s'ha obert per a lectura/escriptura"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema de dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "tipus: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: lectura: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: desbordament de l'entrada"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12663,71 +12802,65 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "usuari"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "usuaris"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "la cerca ha fallat"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Fitxer següent: %s)"
 
 # FIXME 'y' untranslateable?
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "és y\n"
 
 # FIXME 'n' untranslateable?
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "és n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "semàfors assignats = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "id invàlid : %s\n"
@@ -12743,52 +12876,46 @@ msgstr ""
 "Useu «%s [opcions] %s» si realment desitgeu usar-lo.\n"
 "No s'ha executat script.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "No s'ha pogut obrir el fitxer '%s'"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "S'ha iniciat l'execució de script, el fitxer és %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "S'ha iniciat l'execució de script a %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: no s'ha pogut trobar el dispositiu per a %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12797,80 +12924,77 @@ msgstr ""
 "\n"
 "S'ha finalitzat l'execució de script a %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "S'ha fet la seqüència, el fitxer és %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "no ha estat possible executar openpty\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "No queden pty\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "S'ha produït un error en obrir %s"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "màx. nombre de segments = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "No s'ha pogut obrir el fitxer '%s'"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "no ha estat possible executar ioctl() per llegir l'hora de %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: No s'esperava EOF en el fitxer %s\n"
@@ -12881,111 +13005,108 @@ msgid "Argument error."
 msgstr "%s: Argument erroni, forma d'ús\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "S'ha canviat la informació del finger.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "no s'ha pogut bifurcar"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "no s'ha pogut bifurcar"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "no es pot obrir %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "no es pot (des)activar el mode d'estalvi d'energia\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "no s'ha pogut obrir per a escriptura el dispositiu %s\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "s'ha produït un error a klogctl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "S'ha produït un error en escriure un bolcat de pantalla\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "No s'ha pogut obrir %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM no està definit.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: senyal desconegut %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13013,142 +13134,144 @@ msgstr "bifurcació: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "identificador invàlid"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "valor d'expiració erroni: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: no s'ha pogut obrir el fitxer temporal.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount : no s'ha pogut establir la velocitat de: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "No s'ha pogut obtenir la mida del disc"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Missatge de difusió de %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: no es llegirà de %s; s'utilitzarà l'entrada estàndard.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "la cerca ha fallat"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Fitxer següent: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "forma d'ús: namei [-mx] camí [camí ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: no s'ha pogut trobar el nom de la vostra tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: teniu el permís d'escriptura desactivat.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s no ha entrat a %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s té els missatges inhabilitats a %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s no està connectat\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s té els missatges inhabilitats\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s està connectat més d'una vegada; s'està escrivint a %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Línia d'entrada massa llarga.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Missatge de %s@%s (com a %s) el %s a les %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Missatge de %s@%s el %s a les %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "l'assignació de memòria (malloc) ha fallat"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13327,7 +13450,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13530,7 +13653,7 @@ msgstr ""
 "\n"
 "No s'ha trobat el patró\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "No s'ha trobat el patró"
 
@@ -13597,7 +13720,7 @@ msgstr "hexdump: format incorrecte {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: caràcter de conversió %%%s incorrecte.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13625,7 +13748,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13633,81 +13756,81 @@ msgstr ""
 "%s: Forma d'ús: %s [-número] [-p cadena] [-cefnrs] [+línia] [+/patró/] "
 "[fitxers]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: l'opció requereix un argument -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opció il·legal -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...s'està saltant endavant\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...s'està saltant endarrera\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "No hi ha cap fitxer següent"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "No hi ha cap fitxer anterior"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: S'ha produït un error de lectura en el fitxer %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: No s'esperava EOF en el fitxer %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: S'ha produït un error desconegut en el fitxer %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No es pot cerar el fitxer temporal\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Error RE:"
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "No es recorda la cadena de cerca"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "No s'ha pogut obrir"
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "s'ha desat"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": no es permet !ordre en el mode rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "no ha estat possible executar fork(), proveu-ho més endavant\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Fitxer següent: "
 
@@ -13775,8 +13898,8 @@ msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13792,39 +13915,105 @@ msgstr "%s: s'ha produït un error en obrir: %s\n"
 msgid "no input file specified"
 msgstr "No s'ha especificat l'opció --date.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "hi ha hagut un problema en llegir terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Seqüència d'escapament desconeguda en l'entrada: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Línia d'entrada massa llarga.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Forma d'ús:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "S'ha produït un error en tancar el fitxer\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Podeu canviar l'etiqueta de les particions no buides.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Avís: la partició %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Avís: les particions %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "i %s encavalquen\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "dispositiu: semblant a /dev/hda o /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "octets"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Forma d'ús: %s [opcions] dispositiu ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13976,30 +14165,12 @@ msgstr "Línia d'entrada massa llarga.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [o --help]:       Imprimeix aquest missatge"
 
-#~ msgid "dangerous options:"
-#~ msgstr "opcions perilloses:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [o --show-geometry]:  Imprimeix la idea que té el nucli de la "
 #~ "geometria"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [o --show-pt-geometry]: Imprimeix la geometria que s'ha endevinat\n"
-#~ "                               partir de la taula de particions"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [o --show-extended]:  També llista les particions esteses a la "
-#~ "sortida\n"
-#~ "                             o els descriptors esperats en l'entrada"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14065,58 +14236,9 @@ msgstr "Línia d'entrada massa llarga.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [opcions] [--] cadena_opcions paràmetres\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [opcions] -o|--options cadena_opcions [opcions] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              paràmetres\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Permet opcions llargues amb només un -\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Aquesta petita guia d'ús\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=opc_llarg   Opcions llargues a reconèixer\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=nom_programa      El nom amb el que s'informa dels errors\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=cadena_opcions Opcions curtes a reconèixer\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Inhabilita els informes d'error "
-#~ "mitjançant\n"
-#~ "                               getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           No hi ha sortida normal\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=intèrpret_ordres Estableix els mateixos convenis quant a "
-#~ "les\n"
-#~ "                               cometes que l'interpret d'ordres indicat\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Prova la versió del getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr ""
-#~ "  -u, --unqote                 No es posarà la sortida entre cometes\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Mostra la informació de la versió\n"
-
 #, fuzzy
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (millorat) 1.1.3\n"
diff --git a/po/cs.po b/po/cs.po
index 466a8d879..7032f4972 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -25,8 +25,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.19-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2011-07-24 20:58+0200\n"
 "Last-Translator: Petr Písař <petr.pisar@atlas.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -120,29 +120,29 @@ msgstr "načte znovu tabulku rozdělení disku"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "vrátí velikost vyjádřenou v 512bajtových sektorech"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s: (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "%s nelze otevřít"
@@ -224,7 +224,7 @@ msgid "Verifying ... "
 msgstr "Ověřuji… "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Soubor „%s“ nelze otevřít"
@@ -264,15 +264,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -285,7 +285,7 @@ msgstr "%s na %s\n"
 msgid "cannot stat file %s"
 msgstr "volání stat pro zařízení %s selhalo"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, c-format
 msgid "%s: not a block device"
@@ -334,8 +334,8 @@ msgid "stat failed: %s"
 msgstr "volání stat selhalo: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "volání open selhalo: %s"
@@ -558,55 +558,55 @@ msgstr "chybné umístění dat souboru"
 msgid "compiled without -x support"
 msgstr "přeloženo bez podpory pro -x"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Použití: %s [-larvsmf] NÁZEV_ZAŘÍZENÍ\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s je již připojeno.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Chcete opravdu pokračovat"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "prohlídka ukončena.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Číslo zóny < PRVNÍ_ZÓNA v souboru „%s“."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Číslo zóny >= počet ZÓN v souboru „%s“."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Odstranit blok"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Chyba při čtení: nelze se posunout na blok v souboru „%s“\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Chyba při čtení: chybný blok v souboru „%s“\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -615,294 +615,294 @@ msgstr ""
 "Vnitřní chyba: pokus o zápis chybného bloku.\n"
 "Žádost o zápis ignorována.\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "chyba při posunu ukazovátka ve write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Chyba při zápisu: chybný blok v souboru „%s“\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "chyba při posunu ukazovátka ve write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "superblok nelze zapsat"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "mapu i-uzlů nelze zapsat"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "mapu zón nelze zapsat"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "i-uzly nelze zapsat"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "chyba při posunu ukazovátka"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "buffer pro superblok nelze alokovat"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "superblok nelze číst"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "superblok obsahuje chybné magické číslo"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Podporovány jsou pouze 1kilobajtové bloky/zóny"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou položku s_imap_blocks"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "superblok obsahuje chybnou položku s_zmap_blocks"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Buffer pro mapu i-uzlů nelze alokovat"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Buffer pro mapu zón nelze alokovat"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Buffer pro i-uzly nelze alokovat"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Buffer pro počítadlo i-uzlů nelze alokovat"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Buffer pro počítadlo zón nelze alokovat"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Mapu i-uzlů nelze číst"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Mapu zón nelze číst"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "I-uzly nelze číst"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varování: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "i-uzlů: %ld\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "bloků: %ld\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "První_zóna_dat=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Velikost_zóny=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxvelikost=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stav systému souborů=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "namelen=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "I-uzel %d je označen jako nepoužívaný, ale je použit pro soubor „%s“\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Označen jako používaný"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Typ souboru „%s“ je %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Varování: počet i-uzlů je příliš veliký.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "root i-uzel není adresářem"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok byl použit již předtím. Nyní v souboru „%s“."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Smazat"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d v souboru „%s“ je označen jako nepoužívaný."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Opravit"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Adresář „%s“ obsahuje pro soubor „%.*s“ chybné číslo i-uzlu."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Odstranit"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: chybný adresář: „.“ není první\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: chybný adresář: „..“ není druhý\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "vnitřní chyba"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: chybný adresář: velikost < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "chyba při posunu ukazovátka v bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Mód I-uzlu %d není smazán."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "I-uzel %d není používán a v bitmapě označen jako používaný."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "I-uzel %d je používán a v bitmapě označen jako nepoužívaný."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Nastavit"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-uzel %d (mode = %07o), i_nlinks=%d, napočítáno=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Nastavit i_nlinks na počet"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zóna %di: je označena jako používaná a žádné soubory ji nepoužívají."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Odznačit"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zóna %d: je používaná, napočítáno=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zóna %d: není používaná, napočítáno=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "chybná velikost i-uzlu"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "chybná velikost v2 i-uzlu"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "opravy s účastí uživatele vyžadují terminál"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "„%s“ nelze otevřít: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s je čisté, ověřování vynecháno.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Kontrola systému souborů na %s vynucena.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Systém souborů na %s je špinavý, je třeba jej zkontrolovat.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -911,12 +911,12 @@ msgstr ""
 "\n"
 "používaných i-uzlů: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "používaných zón: %6ld (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -939,7 +939,7 @@ msgstr ""
 "------\n"
 "souborů:              %6d\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1065,7 +1065,7 @@ msgstr "příliš mnoho i-uzlů – maximum je 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "nedostatek místa, je třeba alespoň %llu bloků"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Zařízení: %s\n"
@@ -1241,10 +1241,8 @@ msgstr "%6.2f%% (%+ld bytů)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Chyba při zavírání souboru\n"
+msgid "cannot close file %s"
+msgstr "Soubor „%s“ nelze otevřít"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1353,88 +1351,98 @@ msgstr ""
 "některé\n"
 "soubory zařízení budou špatné.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Použití: %s [ -n ] [-c | -l soubor] [-nXX] [-iXX] /dev/název [bloky]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s je připojeno; systém souborů zde vytvářet nebudu!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "chyba při posunu ukazovátka na startovací blok ve write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "startovací blok nelze smazat"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "chyba při posunu ukazovátka ve write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "superblok nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "mapu i-uzlů nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "mapu zón nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "i-uzly nelze zapsat"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "chyba při posunu ukazovátka ve write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "chyba při zápisu ve write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "příliš mnoho chybných bloků"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "nedostatek korektních bloků"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "buffer pro superblok nelze alokovat"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "buffery pro mapy nelze alokovat"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "buffery pro i-uzly nelze alokovat"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "i-uzlů: %ld\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "bloků: %ld\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1443,97 +1451,97 @@ msgstr ""
 "Maxvelikost=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "chyba při posunu ukazovátka v průběhu kontroly bloků"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nesprávné hodnoty v do_check: pravděpodobně chyby\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "chyba při posunu ukazovátka v check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "chybné bloky před datovou oblastí: systém souborů nelze vytvořit"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "chybných bloků: %d\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "chybných bloků: 1\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "soubor chybných bloků nelze otevřít"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "chyba vstupu u čísla špatného bloku na řádku %d\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "soubor s chybnými bloky nelze přečíst"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "chybná velikost i-uzlu"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "chyba strtol: počet bloků nebyl zadán"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: volání stat selhalo"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: otevření se nezdařilo"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: zařízení se právě používá"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "velikost bloku je menší než velikost fyzického sektoru %s"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "nelze zjistit velikost %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "nebudu se pokoušet vytvořit systém souborů na „%s“"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "počet bloků je příliš malý"
@@ -1872,7 +1880,7 @@ msgstr "jmenovka je příliš dlouhá. Zkrácena na „%s“"
 msgid "%s: failed to write label"
 msgstr "%s: chyba při zápisu jmenovky"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2218,7 +2226,7 @@ msgid "   Logical"
 msgstr "  Logický"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Neznámý"
 
@@ -2876,12 +2884,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Příkaz pro BSD popis disku (m pro nápovědu): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "První %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Poslední %s či +velikost či +velikostM či +velikostK"
@@ -3031,7 +3039,7 @@ msgid "tracks/cylinder"
 msgstr "stop/cylindr"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cylindry"
 
@@ -3098,12 +3106,12 @@ msgstr "Již je vytvořeno maximální množství oddílů.\n"
 msgid "This partition already exists.\n"
 msgstr "Tento oddíl již existuje.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Varování: příliš mnoho oddílů (%d, maximum %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3322,7 +3330,7 @@ msgstr "Musíte nastavit"
 msgid "heads"
 msgstr "hlavy"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektory"
 
@@ -3765,7 +3773,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Zavádět   Začátek       Konec    Bloky    Id  Systém\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Zařízení"
 
@@ -3849,7 +3857,7 @@ msgstr "Celkový počet alokovaných sektorů %'llu je větší než maximum %'l
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "Zbývá %'lld nealokovaných %dbajtových sektorů\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -4007,37 +4015,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Synchronizují se disky.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Diskový oddíl %d neobsahuje datovou oblast.\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nový začátek dat"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Příkaz pro odborníky (m pro nápovědu): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Počet cylindrů"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Počet hlav"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Počet sektorů"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varování: nastaven posun sektoru kvůli kompatibilitě s DOSEM\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4050,33 +4058,33 @@ msgstr ""
 "nepodporuje GPT. Použijte GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Na disku %s není korektní tabulka rozdělení disku.\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s nelze otevřít.\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s nelze otevřít.\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "příkaz %c není znám\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Toto jádro detekuje velikost sektoru automaticky - přepínač -b ignorován\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4086,16 +4094,16 @@ msgstr ""
 "jedním\n"
 "          zadaným zařízením.\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Na %s nalezen OSF/1 popis disku. Spouštím režim popisu disku.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Příkaz (m pro nápovědu): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4104,16 +4112,16 @@ msgstr ""
 "\n"
 "Aktuální startovací soubor: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Zadejte název nového startovacího souboru: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startovací soubor nebyl změněn.\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4433,9 +4441,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVybral jste si neobvyklý název pro startovací soubor.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Lituji, můžete měnit značku neprázdných oddílů.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Hodiny reálného času může nastavit pouze superuživatel.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4450,7 +4458,7 @@ msgstr ""
 "a fx. Výjimkou je pouze „SGI svazek“ zaujímající celý disk.\n"
 "Zadejte ANO, pokud jste si jisti, že chcete označit tento oddíl jinak.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "ANO\n"
 
@@ -4647,7 +4655,7 @@ msgstr "Nevyužívaný prostor - sektory 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nevyužívaný prostor - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4656,7 +4664,7 @@ msgstr ""
 "Jiné oddíly již zaujímají celý disk.\n"
 "Smažte/zmenšete nějaké a zkuste to znovu.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4665,12 +4673,12 @@ msgstr ""
 "Velmi se doporučuje, aby třetí oddíl zaujímal celý prostor disku\n"
 "a byl typu „Celý disk“\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je již alokován\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4681,7 +4689,7 @@ msgstr ""
 "zasahuje jiné oddíly. Vaše údaje byly změněny na %d %s.\n"
 
 # TODO: Pluralize
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4691,7 +4699,7 @@ msgstr ""
 "tohoto oddílu jako Celého disku (5), začínajícího na 0, o délce\n"
 "v sektorech %u\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4705,7 +4713,7 @@ msgstr ""
 "Zadejte YES, pokud jste si jisti, že chcete tento oddíl označit jako 82\n"
 "(odkládací prostor pro Linux): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4726,7 +4734,7 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4740,28 +4748,28 @@ msgstr ""
 "Jednotky = %s po %d * 512 bajtech\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Příznak Začátek     Konec  Bloky    Id  Systém\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Počet alternativních cylindrů"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektory na cylindr"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Interleave faktor"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Rychlost otáčení (otm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Počet fyzických cylindrů"
 
@@ -5217,7 +5225,7 @@ msgstr "Disk %s: geometrii nelze zjistit\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: velikost nelze zjistit\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5228,22 +5236,22 @@ msgstr ""
 "celý disk. Použití fdisku je v tom případě pravděpodobně zbytečné\n"
 "[Použijte přepínač --force pokud to opravdu chcete.]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varování: dle HDIO_GETGEO je počet hlav %lu\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varování: dle HDIO_GETGEO je počet sektorů %lu\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varování: dle BLKGETSIZE/HDIO_GETGEO je počet cylindrů %lu\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5252,7 +5260,7 @@ msgstr ""
 "Varování: podivný počet sektorů (%lu) - obvykle nebývá více než 63\n"
 "To způsobí problémy všem programům, které používají CHS adresování.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5261,39 +5269,39 @@ msgstr ""
 "\n"
 "Disk %s: cylindrů: %lu, hlav: %lu, sektorů/stopu: %lu\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "%s oddílu %s má chybný počet hlav: %lu (mělo by být 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
 "%lu)\n"
 msgstr "%s oddílu %s má chybný počet sektorů: %lu (mělo by být 1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
 "%lu)\n"
 msgstr "%s oddílu %s má chybný počet cylindrů: %lu (mělo by být 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr "Id  Název\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Načítám znovu tabulku rozdělení disku…\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5303,26 +5311,26 @@ msgstr ""
 "Dříve než použijete mkfs, spusťte partprobe(8), kpartx(8) nebo restartujte\n"
 "systém.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Chyba při zavírání %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: oddíl neexistuje\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "Neznámý formát - používám sektory\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "nepoužívaný formát - používám %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5331,12 +5339,12 @@ msgstr ""
 "Jednotky = cylindry po %lu bajtech, bloky po 1024 bajtech, počítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "Zařízení  Boot Začátek   Konec Cyldrů   Bloků     Id  Systém\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5345,12 +5353,12 @@ msgstr ""
 "Jednotky = sektory po 512 bajtech, počítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "Zařízení  Boot    Začátek     Konec Sektorů   Id  Systém\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5359,12 +5367,12 @@ msgstr ""
 "Jednotky = bloky po 1024 bajtech, počítáno od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "Zařízení  Boot   Začátek     Konec  Bloků     Id  Systém\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5374,31 +5382,31 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "Zařízení  Boot Začátek Konec  MiB    Bloků     Id  Systém\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tzačátek: (c,h,s) předpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tkonec: (c,h,s) předpoklad (%ld,%ld,%ld) nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "oddíl končí na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Nebyly nalezeny žádné oddíly\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5409,51 +5417,41 @@ msgstr ""
 "pro C/H/S=*/%ld/%ld (místo %ld/%ld/%ld).\n"
 "Zobrazuji za použití této geometrie.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "Nebyla nalezena žádná tabulka rozdělení disku.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Zvláštní - počet definovaných oddílů je pouze %d.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Varování: oddíl %s má velikost 0 a není označen jako prázdný.\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varování: oddíl %s má velikost 0 a je startovací.\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varování: oddíl %s má velikost 0 a nenulový začátek.\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Varování: oddíl %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "není obsažen v oddílu %s.\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Varování: oddíly %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "a %s se navzájem překrývají.\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Varování: oddíl %d je prázdný.\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5462,17 +5460,17 @@ msgstr ""
 "Varování: oddíl %s obsahuje část tabulky rozdělení disku (sektor %lu)\n"
 "a v případě zaplnění ji zničí\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varování: oddíl %s začíná na sektoru 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varování: oddíl %s přesahuje za konec disku.\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5480,17 +5478,17 @@ msgstr ""
 "Pouze jeden z primárních oddílů může být rozšířeným.\n"
 "(Ačkoliv v Linux to není problém.)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varování: oddíl %s nezačíná na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varování: oddíl %s nekončí na hranici cylindru.\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5498,7 +5496,7 @@ msgstr ""
 "Varování: více než jeden primární oddíl je označen jako startovací.\n"
 "LILU to nečiní problémy, ale DOS MBR z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5506,7 +5504,7 @@ msgstr ""
 "Varování: obyčejně je možné startovat pouze z primárních oddíl|ů.\n"
 "LILO nebude brát ohled na příznak 'startovací'.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5514,33 +5512,33 @@ msgstr ""
 "Varování: žádný primární oddíl není označen jako startovací.\n"
 "LILU to nečiní problémy, ale DOS z tohoto disku nenastartuje.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "začátek"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "oddíl %s: začátek: (c,h,s) předpoklad (%ld,%ld,%ld), nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "konec"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "oddíl %s: konec: (c,h,s) předpoklad (%ld,%ld,%ld), nalezeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "oddíl %s končí na cylindru %ld, t.j. za koncem disku\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5549,7 +5547,7 @@ msgstr ""
 "Varování: začátek rozšířeného oddílu posunut z %ld na %ld.\n"
 "(Pouze pro účely výpisu. Neměňte jeho obsah.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5557,133 +5555,133 @@ msgstr ""
 "Varování: rozšířený oddíl nezačíná na hranici cylindru.\n"
 "DOS a Linux budou jeho obsah interpretovat rozdílně.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "příliš mnoho oddílů - ignoruji > %d\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "strom oddílů?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "nalezen Disk Manager - s tím neumím pracovat\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "nalezen DM6 podpis - končím\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "zvláštní…, rozšířený oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "zvláštní…, BSD oddíl o velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: nerozpoznaný typ tabulky rozdělení disku\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "byl zadán přepínač -n: Nic nebylo změněno\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Chyba při ukládání starých sektorů - končím\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Chyba při zápisu oddílu na %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "příliš dlouhý či neúplný řádek - končím\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "vstupní chyba: po položce %s jsem očekával znak „=“\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "vstupní chyba: neočekávaný znak %c po položce %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nerozpoznaný vstup: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "číslo je příliš veliké\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "nesmysly za číslem\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "není místo pro popis oddílu\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "okolní rozšiřující oddíl nelze vytvořit\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "příliš mnoho vstupních položek\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Již nejsou volné bloky\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Chybný typ\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Varování: zadaná velikost(%lu) překračuje maximální povolenou velikost "
 "(%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Varování: prázdný oddíl\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varování: chybný začátek oddílu (dřívější %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nerozpoznaný příznak 'startovací' - zvolte - či *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "neúplná c,h,s specifikace?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Rozšířený oddíl na neočekávaném místě\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "chybný vstup\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "příliš mnoho oddílů\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5695,102 +5693,185 @@ msgstr ""
 "<začátek> <velikost> <typ [E,S,L,X,hex]> <startovací [-,*]> <c,h,s> <c,h,s>\n"
 "Obvykle je třeba zadat pouze <začátek> a <velikost> (a možná <typ>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
+msgstr "Použití:\n"
+
+#: fdisk/sfdisk.c:2332
+#, fuzzy, c-format
+msgid " %s [options] <device> [...]\n"
 msgstr ""
 "\n"
 "Použití:\n"
 "  %s [PŘEPÍNAČE] [ZAŘÍZENÍ…]\n"
 
-#: fdisk/sfdisk.c:2355
-#, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "Zařízení: něco jako /dev/hda či /dev/sda"
-
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Přepínače:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "Nebezpečné přepínače:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [či --show-pt-geometry]:\n"
+"                         vypíše informace o geometrii, která byla odhadnuta\n"
+"                         z tabulky rozdělení disku"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [či --show-extended]:\n"
+"                         vypíše informace o rozšířených diskových\n"
+"                         oddílech a na vstupu bude očekávat jejich popis"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Použití:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s zařízení\t\t vypíše aktivní oddíly na daném zařízení\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s zařízení n1 n2 ... aktivuje oddíly n1 ..., deaktivuje ostatní\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An zařízení\t aktivuje oddíl n, deaktivuje ostatní\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5803,62 +5884,62 @@ msgstr ""
 "sfdisk nepodporuje GPT. Použijte GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "K potlačení této kontroly použijte přepínač --force.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "žádný příkaz?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "celkový počet bloků: %'llu\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Použití: sfdisk --print-id zařízení číslo_oddílu\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Použití: sfdisk --change-id zařízení číslo_oddílu ID\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Použití: sfdisk --id zařízení číslo_oddílu [ID]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "můžete zadat pouze jedno zařízení (výjimkou jsou přepínače -l a -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s nelze otevřít pro čtení i zápis.\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s nelze otevřít pro čtení\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindrů, %ld hlav, %ld sektorů/stopu\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Nelze zjistit velikost %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "chybný aktivní bajt: 0x%x místo 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5866,7 +5947,7 @@ msgstr ""
 "Hotovo\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5875,35 +5956,35 @@ msgstr ""
 "Počet aktivních oddílů je %d. LILU to nečiní problémy, ale DOS MBR\n"
 "nastartuje pouze z disku s jedním aktivním oddílem.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "oddíl %s má id %x a není skrytý\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id %lx je chybné\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Tento disk je právě používán.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatální chyba: %s nelze nalézt\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varování: %s není blokovým zařízením\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Ověřuji, zda tento disk není právě používán…\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5916,30 +5997,30 @@ msgstr ""
 "všechny odkládací prostory na tomto disku. K potlačení této kontroly můžete\n"
 "použít přepínač --no-reread.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Použijte přepínač --force k potlačení veškerých kontrol.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Stará situace:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Diskový oddíl %d neexistuje. Nelze jej změnit.\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Nová situace:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5947,21 +6028,21 @@ msgstr ""
 "Toto rozložení oddílů se mi nelíbí - nic nebude změněno.\n"
 "(Pokud jej opravdu chcete použít, pak zadejte přepínač --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Toto se mi nelíbí - měl byste odpovědět NO\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Vyhovuje Vám to? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Uložit na disk? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5970,16 +6051,16 @@ msgstr ""
 "\n"
 "sfdisk: předčasný konec vstupu\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Končím - nebyly učiněny žádné změny\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Odpovězte prosím y,n či q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5988,7 +6069,7 @@ msgstr ""
 "Nová tabulka rozdělení disku byla úspěšně uložena.\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6020,26 +6101,28 @@ msgstr "Zamyká se disk %s… "
 msgid "(waiting) "
 msgstr "(čeká se)"
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr "úspěch"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s uspěl.\n"
 
 # FIXME: Should be `failure'
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 msgid "failed"
 msgstr "selhání"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "VAROVÁNÍ: %s se nepodařilo otevřít: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "VAROVÁNÍ: chybný formát na řádku %d souboru %s\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -6051,37 +6134,37 @@ msgstr ""
 "\tco nejdříve.\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: nenalezeno\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s: wait: Žádní další potomci?!\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "Varování… %s nad zařízením %s skončil signálem %d.\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s %s: status je %x, to by nikdy nemělo přihodit.\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "%s dokončeno (návratový kód %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: Chyba %d při provádění fsck.%s nad %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6090,7 +6173,7 @@ msgstr ""
 "Buďto všechny, nebo žádný z typů souborových systémů předaných v -t musí\n"
 "být uvedeny s počátečním „no“ nebo „!“.\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
@@ -6098,12 +6181,12 @@ msgstr ""
 "%s: přeskakuji chybný řádek v /etc/fstab: přípojný bod typu bind\n"
 "s nenulovým pořadím kontroly\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: přeskakuje se neexistující zařízení\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
@@ -6112,21 +6195,21 @@ msgstr ""
 "%s: neexistující zařízení (zařízení lze vynechat uvedením volby „nofail“ do "
 "fstabu)\n"
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck: %s nelze zkontrolovat: fsck.%s nenalezen\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "Kontroluji všechny systému souborů.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "– čeká se – (průchod %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6136,58 +6219,58 @@ msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: příliš mnoho zařízení\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "%s nelze nalézt\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "Je /proc připojeno?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Jen root může hledat odpovídající souborové systémy: %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Nebylo možné nalézt odpovídající systém souborů: %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: příliš mnoho argumentů\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 #, fuzzy
 msgid "the -l option can be used with one device only -- ignore"
 msgstr "%s: přepínač -l lze použít pouze s jedním zařízením – ignoruje se\n"
@@ -6207,33 +6290,79 @@ msgstr "prázdná dlouhá volba po přepínači -l či --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "neznámý shell po přepínači -s či --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [volby] -o|--options řetězec-s-volbami [volby] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            Akceptuje dlouhé volby začínající jedním -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Vypíše tuto nápovědu\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=dlouhvol   Rozpoznávané dlouhé volby\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=názevprog          Název, pod kterým jsou oznamovány chyby\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=krátvol        Rozpoznávané krátké volby\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Vypne oznamování chyb pomocí getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Žádný normální výstup\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=shell            Nastaví konvence uzavíraní\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Testuje verzi getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 neuzavře výstup do uvozovek\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Vypíše informace o verzi\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "chybí řetězec-s-volbami"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "Vnitřní chyba, oznamte ji autorovi."
 
@@ -6693,92 +6822,110 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Hodnotu počátku epochy v jádře nelze nastavit.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Přepínače:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "                       určí typ vašeho systému Alpha (vizte hwclock(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Nelze se připojit ke kontrolnímu systému\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "PID se nezdařilo rozebrat"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s akceptuje pouze přepínače. Zadáno argumentů, které nejsou přepínači: %d\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6787,14 +6934,14 @@ msgstr ""
 "Zadal jste vícero funkčních přepínačů.\n"
 "Program může provést v jeden okamžik právě jednu funkci.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr "%s: Přepínače --utc a --localtime nelze použít zároveň.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6803,7 +6950,7 @@ msgstr ""
 "%s: Volby --adjust a --noadjfile se vzájemně vylučují. Vy jste však použil "
 "obě.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6812,39 +6959,39 @@ msgstr ""
 "%s: Volby --adjfile a --noadjfile se vzájemně vylučují. Vy jste však použil"
 "(a) obě.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: Současně s --noadjfile musíte použít buď --utc, nebo --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Nebyl zadán platný čas, který mám nastavit. Hodiny nelze nastavit.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Hodiny reálného času může nastavit pouze superuživatel.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Hodiny reálného času může nastavit pouze superuživatel.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr "Hodnotu počátku epochy v jádře může nastavit pouze superuživatel.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "Žádným ze známých způsobů nelze získat přístup k hodinám reálného času.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7023,7 +7170,7 @@ msgid "failed to read mtab"
 msgstr "čtení selhalo: %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr "iterátor libmountu se nepodařilo inicializovat"
 
@@ -7070,89 +7217,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
-"\n"
-"Přepínače:\n"
-" -a, --all               připojí veškeré souborové systémy uvedené ve fstab\n"
-" -f, --fake              zkušební režim, vynechá volání systému mount(2)\n"
-" -F, --fork              pro každé zařízení vytvoří potomka (použít s -a)\n"
-" -h, --help              tato nápověda\n"
-" -n, --no-mtab           nezapíše do /etc/mtab\n"
-" -r, --read-only         souborový systém připojí jen pro čtení (stejné "
-"jako\n"
-"                         -o ro)\n"
-" -v, --verbose           sdílný režim\n"
-" -V, --version           vypíše verzi programu\n"
-" -w, --read-write        souborový systém připojí pro čtení i zápis "
-"(výchozí)\n"
-" -o, --options SEZNAM    volby připojení oddělené čárkou\n"
-" -O, --test-opts SEZNAM  omezí množinu souborových systémů (použít s -a)\n"
-" -t, --types SEZNAM      určí druh souborového systému\n"
-" -c, --no-canonicalize   cesty nepřevede na kanonický tvar\n"
-" -i, --internal-only     nezavolá pomocný program mount.DRUH\n"
-" -l, --show-labels       vypíše všechny připojené systémy a jejich jmenovky\n"
-"\n"
-"Zdroj:\n"
-" -L, --label JMENOVKA    synonymum pro LABEL=JMENOVKA\n"
-" -U, --uuid UUID         synonymum pro UUID=UUID\n"
-" LABEL=JMENOVKA          určí zařízené podle jmenovky systému souborů\n"
-" UUID=UUID               určí zařízení podle UUID systému souborů\n"
-" ZAŘÍZENÍ                určí zařízení podle cesty\n"
-" ADRESÁŘ                 bod připojení pro vázaná připojení (vizte --bind/"
-"rbind)\n"
-" SOUBOR                  obyčejný soubor pro připojení přes loop zařízení\n"
-"\n"
-"Operace:\n"
-" -B, --bind              připojí podstrom někam jinam (stejné jako -o bind)\n"
-" -M, --move              přesune podstrom na jiné místo\n"
-" -R, --rbind             připojí podstrom a všechny podřízené systémy jinam\n"
-" --make-shared           označí podstrom jako sdílený\n"
-" --make-slave            označí podstrom jako podřízený\n"
-" --make-private          označí podstrom jako soukromý\n"
-" --make-unbindable       označí podstrom jako vázaně nepřipojitelný\n"
-" --make-rshared          rekurzivně označí celý podstrom jako sdílený\n"
-" --make-rslave           rekurzivně označí celý podstrom jako podřízený\n"
-" --make-rprivate         rekurzivně označí celý podstrom jako soukromý\n"
-" --make-runbindable      rekurzivně označí celý podstrom jako vázaně\n"
-"                         nepřipojitelný\n"
-
-#: libmount/samples/mount.c:243
+
+#: libmount/samples/mount.c:250
 #, c-format
 msgid ""
 "\n"
@@ -7161,26 +7304,26 @@ msgstr ""
 "\n"
 "Více informací naleznete v mount(8).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr "alokace kontextu libmount se nezdařila"
 
 # XXX: Nepřekládat „append“ jako „připojit“, hrozí záměna s „mount“
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 msgid "failed to append options"
 msgstr "nepodařilo se přiřetězit volbu"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 msgid "failed to set options pattern"
 msgstr "nepodařilo se nastavit vzorek voleb"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 #, fuzzy
 msgid "only one <source> may be specified"
 msgstr "lze zadat pouze jeden zdroj"
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 msgid "failed to allocate source buffer"
 msgstr "paměť pro zdroj nelze alokovat"
 
@@ -7264,7 +7407,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: chyba PAM, končí se: %s"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Heslo: "
 
@@ -7703,46 +7846,47 @@ msgid "too many bare linefeeds."
 msgstr "příliš mnoho znaků odřádkování."
 
 # FIXME: plurals
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr "Vypršel časový limit %d sekund"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Poslední přihlášení: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "%.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 msgid "write lastlog failed"
 msgstr "zápis do protokolu přihlášení (lastlog) se nezdařil"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "CHYBNÉ PŘIHLÁŠENÍ UŽIVATELE %2$s Z %1$s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "CHYBNÉ PŘIHLÁŠENÍ UŽIVATELE %2$s NA TTY %1$s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "POČET CHYBNÝCH PŘIHLÁŠENÍ UŽIVATELE %3$s Z %2$s: %1$d"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "POČET CHYBNÝCH PŘIHLÁŠENÍ UŽIVATELE %3$s NA TTY %2$s: %1$d"
@@ -7767,7 +7911,7 @@ msgstr "povolení zamítnuto"
 msgid "setuid failed"
 msgstr "volání setuid selhalo"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "spuštění %s selhalo"
@@ -7812,8 +7956,8 @@ msgstr "%s: Nelze nastavit kontext pro %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: %s nelze odemknout: %s (Vaše změny jsou stále v %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "volání fork selhalo"
 
@@ -7865,24 +8009,21 @@ msgstr "chybná hodnota pro rok: použijte 1–9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Použití: %s [-13smjyV] [[[DEN] MĚSÍC] ROK]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7993,32 +8134,32 @@ msgstr " Odstranit"
 msgid "failed to add line to output"
 msgstr "přidání řádku na výstup selhalo"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, c-format
 msgid "%s: parse error at line %d"
 msgstr "%s: chyba rozboru na řádku %d"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "tabulku libmountu se nepodařilo inicializovat"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "z %s nelze číst."
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "tabulku libmountu se nepodařilo inicializovat"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "volání malloc() selhalo"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8035,75 +8176,67 @@ msgstr ""
 " %1$s [VOLBY] <ZAŘÍZENÍ> <BOD_PŘIPOJENÍ>\n"
 " %1$s [VOLBY] [--source <ZAŘÍZENÍ>] [--target <BOD_PŘIPOJENÍ>]\n"
 
-#: misc-utils/findmnt.c:770
-#, fuzzy, c-format
+#: misc-utils/findmnt.c:772
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
-"\n"
-msgstr ""
-"\n"
-"Volby:\n"
-" -s, --fstab            hledá ve statické tabulce souborových systémů\n"
-" -m, --mtab             hledá v tabulce připojených souborových systémů\n"
-" -k, --kernel           hledá v jaderné tabulce připojených souborových\n"
-"                        systémů (implicitní)\n"
-"\n"
-" -c, --canonicalize     cesty vypisuje v kanonickém tvaru\n"
-" -d, --direction <SMĚR> směr hledání – „forward“ (dopředné) nebo\n"
-"                        „backward“ (zpětné)\n"
-" -e, --evaluate         všechny značky (jmenovky/UUID) před zobrazením\n"
-"                        vyhodnotí\n"
-" -f, --first-only       vypíše pouze první nalezený souborový systém\n"
-" -h, --help             zobrazí tuto nápovědu\n"
-" -i, --invert           obrátí smysl vyhledávacích pravidel\n"
-" -l, --list             výstup ve formátu seznamu\n"
-" -n, --noheadings       nezobrazí záhlaví\n"
-" -u, --notruncate       nezkracuje text ve sloupcích\n"
-" -O, --options <SEZNAM> omezí množinu souborových systémů podle voleb\n"
-"                        připojení\n"
-" -o, --output <SEZNAM>  zobrazí dané sloupce\n"
-" -r, --raw              neformátovaný výstup\n"
-" -a, --ascii            pro vykreslení stromu použije znaky ASCII\n"
-" -t, --types <SEZNAM>   omezí množinu souborových systémů podle jejich "
-"druhu\n"
-" -v, --nofsroot         u vázaných nebo btrfs připojení nevypisuje [/"
-"adresář]\n"
-" -R, --submounts        u odpovídajících souborových systémů vypisuje "
-"všechny\n"
-"                        podřízené body přípojení\n"
-" -S, --source <ŘETĚZEC> zařízení, LABEL= (jmenovka) nebo UUID=\n"
-" -T, --target <ŘETĚZEC> bod připojení\n"
-"\n"
-
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
+"\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, c-format
 msgid ""
 "\n"
@@ -8112,7 +8245,7 @@ msgstr ""
 "\n"
 "Dostupné sloupce:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
@@ -8121,21 +8254,21 @@ msgstr ""
 "\n"
 "Více informací naleznete ve findmnt(1).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr "volby se vzájemně vylučují"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr "neznámý směr „%s"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "nezdařilo se rozebrat hodnotu time_t"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
@@ -8143,20 +8276,20 @@ msgstr ""
 "volby --target a --source nemohou být použity společně s prvkem příkazového "
 "řádku, který není volbou"
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr "pomocnou paměť libmountu se nepodařilo inicializovat"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr "výstupní tabulku se nepodařilo inicializovat"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr "výstupní sloupec se nepodařilo inicializovat"
 
@@ -8180,12 +8313,12 @@ msgstr "%s: proces „%s“ nelze nalézt\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: neznámý signál %s; platné signály:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Použití: %s [ -s signál | -p ] [ -a ] pid…\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "         %s -l [ signál ]\n"
@@ -8205,88 +8338,87 @@ msgstr "socket: %s\n"
 msgid "connect %s"
 msgstr "connect: %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "připojování"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Další soubor: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "prioritu se nezdařilo rozebrat"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Hodnota je mimo meze.\n"
 
 # 'facility'? lépe asi jako zařízení, zle to by se pletlo s 'device' 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: neznámé příslušenství: %s\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: neznámý název priority: %s\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8421,8 +8553,8 @@ msgstr "adresář zařízení v sysfs se nepodařilo otevřít"
 
 # FIXME: `whole-list' should be `whole-disk'
 #: misc-utils/lsblk.c:792
-#, c-format
-msgid "%s: failed to get whole-list devno"
+#, fuzzy, c-format
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: zjištění čísla zařízení celého disku selhalo"
 
 #: misc-utils/lsblk.c:809
@@ -8441,12 +8573,13 @@ msgid "failed to parse list '%s'"
 msgstr "nezdařilo se rozebrat seznam „%s“"
 
 # FIXME: plurals
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr "seznam vynechaných zařízení je příliš dlouhý (hranice je %d zařízení)"
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, c-format
 msgid ""
 "\n"
@@ -8459,7 +8592,7 @@ msgstr ""
 
 # ???: WTF is holder?
 # ???: Překládat jako „obálka“?
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8501,7 +8634,7 @@ msgstr ""
 " -r, --raw            neformátovaný výstup\n"
 " -t, --topology       vypíše údaje o topologii\n"
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8510,33 +8643,33 @@ msgstr ""
 "\n"
 "Více informací naleznete v lsblk(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Použití: %s [PŘEPÍNAČ]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "%s nelze nalézt\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%db z %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "spuštění %s selhalo"
@@ -8556,26 +8689,15 @@ msgstr "o „%s“ nelze získat podrobnosti"
 msgid "%s - No such file or directory\n"
 msgstr "%s – Takový soubor nebo adresář neexistuje\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE] NÁZEV_CESTY [NÁZEV_CESTY…]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Přepínače:\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8594,8 +8716,7 @@ msgstr ""
 " -n, --nosymlinks    nenásleduje symbolické odkazy\n"
 " -v, --vertical      svislé zarovnání práv a vlastníků\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8603,12 +8724,12 @@ msgstr ""
 "\n"
 "Více informací naleznete v namei(1).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "argument --date je příliš dlouhý\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s: omezení symbolických odkazů překročeno"
@@ -8618,169 +8739,167 @@ msgstr "%s: omezení symbolických odkazů překročeno"
 msgid "renaming %s to %s failed"
 msgstr "%s: %s nelze přejmenovat na %s: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Použití: %s [PŘEPÍNAČE] ZAŘÍZENÍ…\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "chybné argumenty"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "zápis"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "načtení počtu"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "chybná délka odpovědi"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "Nezdařilo se otevřít/vytvořit %s: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "Nezdařilo se zamknout %s: %s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "Démon uuidd již běží pod PID %s\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "Nebylo možné vytvořit unixový proudový socket: %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Nebylo možné se přilepit na unixový socket %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Nebylo možné zahájit naslouchání na unixovém socketu %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Chyba při čtení z klienta, délka = %d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "operace %d, příchozí počet = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr "operace %d\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "Vygenerované časové UUID: %s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "Vygenerované náhodné UUID: %s\n"
 
 # TODO: plurals
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "Vygenerované časové UUID %s a %d následujících\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "Vygenerované časové UUID %s a %d následujících\n"
+msgstr[1] "Vygenerované časové UUID %s a %d následujících\n"
 
 # TODO: plurals
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "Vygenerováno %d UUID:\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "Vygenerováno %d UUID:\n"
+msgstr[1] "Vygenerováno %d UUID:\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "Neplatná operace %d\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "Neočekávaná délka odpovědi od serveru %d\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "Chybné číslo: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Chyba při volání démona uuidd (%s): %s\n"
 
 # TODO: plurals
-#: misc-utils/uuidd.c:546
-#, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s a následující %d UUID\n"
+#: misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s a následující %d UUID\n"
+msgstr[1] "%s a následující %d UUID\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "Seznam UUID:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "Zabít uuidd běžícího pod PID %d nebylo možné: %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "uuidd běžící pod PID %d byl zabit\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8788,31 +8907,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8844,31 +8962,32 @@ msgstr "%s: přesun na pozici 0x%jx selhal"
 msgid "%s: write failed"
 msgstr "%s: zápis se nezdařil"
 
-# TODO: plurals
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd bajtů ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] vymazáno na pozici 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "zadána neplatná hodnota pozice „%s“"
 
-#: misc-utils/wipefs.c:306
+#: misc-utils/wipefs.c:305
 #, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Použití: %s [PŘEPÍNAČE] ZAŘÍZENÍ…\n"
+
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 " -a, --all             zničí všechny magické řetězce (BUĎTE OPATRNÍ!)\n"
 " -h, --help            zobrazí tuto nápovědu\n"
@@ -8877,7 +8996,7 @@ msgstr ""
 " -p, --parsable        vypisuje v strojově zpracovatelném formátu namísto\n"
 "                       v přehledné podobě\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8886,11 +9005,11 @@ msgstr ""
 "\n"
 "Více informací naleznete ve wipefs(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "--offset a --all se vzájemně vylučují"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr "v současnosti je podporováno pouze jedno zařízení v argumentu"
 
@@ -8987,63 +9106,63 @@ msgstr "chyba při změně vlastníka %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nelze přejmenovat na %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: adresář /dev neexistuje."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: zařízení %s nelze nastavit kapacitu: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", odsazení %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", velikostní limit %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", šifrování %s (typ %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", odsazení %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", šifrovací typ %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: informace o zařízení %s nelze získat: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: zařízení %s nelze otevřít: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: chybí oprávnění na prohlédnutí /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: žádné volné loop zařízení nelze najít"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -9053,55 +9172,53 @@ msgstr ""
 "       nezná loop zařízení? (Pokud je tomu tak, pak jej znovu přeložte,\n"
 "       či zkuste „modprobe loop“.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Během čtení hesla došla paměť"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "varování: %s je již spojeno s %s\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "varování: %s: je chráněno proti zápisu, připojuji pouze pro čtení.\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nelze zamknout v paměti. Končím.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "selhalo ioctl LOOP_SET_FD: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): úspěch\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): úspěch\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: zařízení %s nelze smazat: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Tento program byl přeložen bez podpory pro loop. Přeložte jej znovu.\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9109,7 +9226,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Použití:\n"
@@ -9122,19 +9239,17 @@ msgstr ""
 "SOUBOREM\n"
 " %1$s [PŘEPÍNAČE] {-f|--find|LOOP_ZAŘÍZENÍ} SOUBOR  sestrojí zařízení\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9149,32 +9264,32 @@ msgstr ""
 " -v | --verbose           upovídaný režim\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "%s: zadána neplatná pozice „%s“"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "%s: zadáno neplatné omezení délky „%s“"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop zařízení je %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "ukradený loop=%s… zkouším znovu\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: zařízení se právě používá"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Podpora pro loop nebyla při překladu zadána. Přeložte program znovu.\n"
@@ -9752,14 +9867,17 @@ msgstr "chyba ve volání xstrndup"
 msgid "not enough memory"
 msgstr "Nedostatek paměti"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "Parametr ZVLÁŠTNÍ:\n"
@@ -9769,78 +9887,63 @@ msgstr ""
 " SOUBOR                               vybere SOUBOR\n"
 "\n"
 
-#: mount/swapon.c:102
-#, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
 msgstr ""
 "\n"
-"Použití:\n"
-" %1$s -a [-e] [-v] [-f]             zapne všechny odkládací oblasti\n"
-"                                    uvedené v /etc/fstab\n"
-" %1$s [-p PRIORITA] [-d] [-v] [-f] ZVLÁŠTNÍ\n"
-"                                    zapne vybranou odkládací oblast\n"
-" %1$s -s                            vypíše souhrnné informace o využití\n"
-"                                    odkládacích oblastí\n"
-" %1$s -h                            vypíše nápovědu\n"
-" %1$s -V                            vypíše verzi\n"
-"\n"
+"Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Použití:\n"
-" %1$s -a [-v]                      vypne všechny odkládací oblasti\n"
-" %1$s [-v] ZVLÁŠTNÍ                vypne vybranou odkládací oblast\n"
-" %1$s -h                           vypíše nápovědu\n"
-" %1$s -V                           vypíše verzi\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:128
+msgid ""
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
+msgstr ""
+
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: neočekávaný formát souboru"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: reinicializuji odkládací oblast."
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "funkce execv selhala"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "volání waitpid selhalo"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: volání lseek selhalo"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: zápis podpisu selhal"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
@@ -9848,58 +9951,58 @@ msgstr ""
 "řazení bajtů"
 
 # Last argument of "page-size %d, %s byte order"
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "odlišné"
 
 # Last argument of "page-size %d, %s byte order"
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "stejné"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: přístupová práva %04o nejsou bezpečná, %04o by byla lepší."
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: vlastník souboru %d není bezpečný, 0 (root) by byl lepší."
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: vynechávám – zdá se, že obsahuje díry."
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: nepodařilo se zjistit velikost"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: nepodařilo se načíst hlavičku odkládací oblasti"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 "%s: velikost_stránky=%d, velikost_úložiště=%llu, velikost_zařízení=%llu"
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 "%s: last_page 0x%08llx je větší než současní velikost odkládacího prostoru"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: formát odkládacího prostoru se neshoduje ve velikosti stránky."
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9907,37 +10010,37 @@ msgstr ""
 "%s: formát odkládacího prostoru se neshoduje ve velikosti stránky. (Lze ji "
 "reinicializovat pomocí --fixpgsz.)"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s: nalezena data ze softwarového uspání. Přepisuji podpis odkládací oblasti."
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon selhal"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "nelze nalézt zařízení pro %s"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "Nejste superuživatel."
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff selhal"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10202,7 +10305,7 @@ msgstr "%s: chyba při mazání oddílu %d"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "%s: chyba při mazání oddílů %d–%d"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, fuzzy, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr "zadaný rozsah <%d:%d> nedává smysl"
@@ -10263,22 +10366,17 @@ msgid "%s: %s partition table does not contains usable partitions"
 msgstr "%s: tabulka rozdělení disku %s neobsahuje použitelné oddíly"
 
 # FIXME: partx does not set locale
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 "\n"
 "Použití:\n"
 "  %s [-a|-d|-s] [--nr N:M | ZAŘÍZENÍ] CELÝ_DISK\n"
 
 #: partx/partx.c:587
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10289,11 +10387,10 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 "\n"
 "Přepínače:\n"
@@ -10312,8 +10409,8 @@ msgstr ""
 " -h, --help           zobrazí tuto nápovědu\n"
 "\n"
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
@@ -10321,7 +10418,7 @@ msgstr ""
 "\n"
 "Dostupné sloupce (pro přepínač --show):\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, c-format
 msgid ""
 "\n"
@@ -10330,27 +10427,27 @@ msgstr ""
 "\n"
 "Více informací naleznete v partx(8).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "volby se vzájemně vylučují"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 msgid "failed to parse --nr <M-N> range"
 msgstr "rozsah --nr <M–N> se nepodařilo rozebrat"
 
 # FIXME: superfluous currly bracket
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "argumenty --nr a ODDÍL se vzájemně vylučují"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "%s: nepodařilo inicializovat sondu blkid"
@@ -10505,7 +10602,7 @@ msgstr "politiku procesu %d se nepodařilo nastavit"
 msgid "failed to set pid %d's policy"
 msgstr "politiku procesu %d se nepodařilo nastavit"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "spuštění %s selhalo"
@@ -10788,7 +10885,7 @@ msgstr "%s: %ld výchozí prahová hodnota a %ld výchozí časový limit\n"
 msgid "Can't set signal handler"
 msgstr "Zpracování signálu nelze nastavit"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "volání gettimeofday selhalo"
 
@@ -10797,7 +10894,7 @@ msgstr "volání gettimeofday selhalo"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "CYGETMON nelze na %s provést: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10805,12 +10902,12 @@ msgstr ""
 "%s: %lu přerušení, %lu/%lu znaků; fifo: %lu práh, %lu časový limit, %lu max, "
 "%lu nyní\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f přer./s; %f příj., %f odesl. (znak/s)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10818,7 +10915,7 @@ msgstr ""
 "%s: %lu přerušení, %lu znaků; fifo: %lu práh, %lu časový limit, %lu max, %lu "
 "nyní\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f přer./s; %f příj. (znak/s)\n"
@@ -10910,130 +11007,109 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "nelze se démonizovat"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Použití: %s [PŘEPÍNAČE]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "nezdařilo se rozebrat seznam „%s“"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "neznámý uživatel: %s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "nezdařilo se rozebrat seznam „%s“"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "neznámý směr „%s"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "volání fsync selhalo"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "volání write selhalo: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "nezdařilo se rozebrat začátek oblasti: %s"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "žádný příkaz?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "volání msgctl selhalo"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
 msgstr ""
-"Použití: %s [PŘEPÍNAČE] <NÁZEV_SOUBORU>\n"
 "\n"
-"Přepínače:\n"
+"Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -11045,7 +11121,7 @@ msgstr ""
 " -o, --offset <ČÍSLO>  pozice alokace v bajtech\n"
 " -l, --length <ČÍSLO>  délka alokace v bajtech\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -11054,31 +11130,31 @@ msgstr ""
 "\n"
 "Více informací naleznete ve fallocate(1).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "nezadán argument s délkou"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "zadána neplatná hodnota délky"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "zadána neplatná hodnota pozice"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "nezadán název souboru."
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr "neočekávaný počet argumentů"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "režim neměnné velikosti (přepínač -n) není podporován"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: volání fallocate selhalo"
@@ -11086,18 +11162,24 @@ msgstr "%s: volání fallocate selhalo"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "Použití: %1$s [-sxun][-w Č] FD\n"
 "         %1$s [-sxon][-w Č] SOUBOR [-c] PŘÍKAZ…\n"
@@ -11112,55 +11194,51 @@ msgstr ""
 "  -h  --help       Zobrazí tento text\n"
 "  -V  --version    Zobrazí verzi\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s: přepínač %s vyžaduje přesně jeden příkazový argument\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: soubor zámku %s nelze otevřít: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: chybné číslo: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s: vyžaduje deskriptor souboru, soubor nebo adresář\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: volání fork selhalo: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Použití: %s [PŘEPÍNAČE] <BOD_PŘIPOJENÍ>\n"
 "\n"
 "Přepínače:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
+#, fuzzy
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 " -h, --help          tato nápověda\n"
 " -f, --freeze        zmrazí systém souborů\n"
 " -u, --unfreeze      rozmrazí systém souborů\n"
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11168,36 +11246,35 @@ msgstr ""
 "\n"
 "Více informací naleznete ve fsfreeze(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr "nezadána žádná akce"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr "nezadán název souboru"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: volání fstat selhalo"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr "%s: není adresářem"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr "%s: zmrazení se nezdařilo"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s: rozmrazení se nezdařilo"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11211,8 +11288,7 @@ msgstr ""
 " -m, --minimum ČÍSLO  délka nejmenšího zahoditelného rozsahu\n"
 " -v, --verbose        vypíše počet zahozených bajtů\n"
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11220,98 +11296,87 @@ msgstr ""
 "\n"
 "Více informací naleznete v fstrim(1).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, c-format
 msgid "failed to parse length: %s"
 msgstr "nezdařilo se rozebrat délku: %s"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, c-format
 msgid "failed to parse offset: %s"
 msgstr "nezdařilo se rozebrat začátek oblasti: %s"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "nezdařilo se rozebrat délku nejmenšího rozsahu: %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 msgid "no mountpoint specified."
 msgstr "nezadán žádný bod připojení."
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, c-format
 msgid "%s: not a directory"
 msgstr "%s: není adresářem"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: IOCTL volání FITRIM selhalo"
 
 # FIXME: plurals
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
+#, fuzzy, c-format
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr "%s: %<PRIu64> bajtů bylo zahozeno\n"
 
-#: sys-utils/ipcmk.c:84
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr ""
-"\n"
-"Použití: %s [PŘEPÍNAČE]\n"
-"\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <VELIKOST>  vytvoří sdílený paměťový segment o velikost <VELIKOST>\n"
 "  -S <POČET>     vytvoří pole semaforu s POČTEM prvků\n"
 "  -p <MÓD>       práva pro zdroj (implicitní jsou 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Více informací naleznete v ipcmk(1).\n"
 "\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "nepodařilo se vytvořit sdílenou paměť"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "ID sdílené paměti: %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "nepodařilo se vytvořit frontu zpráv"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "ID fronty zpráv: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "nepodařilo se vytvořit semafor"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "ID semaforu: %d\n"
@@ -11828,8 +11893,8 @@ msgstr ""
 "shmid segmentu sdílené paměti = %d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11838,8 +11903,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mód=%#o\tpřístupová práva=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bajtů=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11871,8 +11936,8 @@ msgstr ""
 "msgid fronty zpráv=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmód=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11904,8 +11969,8 @@ msgstr ""
 "semid pole semaforů = %d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11953,16 +12018,14 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "neplatný iflag: %s"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Použití: %s [-dhV78neo12] [-s RYCHLOST] [-i [-]IFLAG ] LDISC ZAŘÍZENÍ\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11970,7 +12033,7 @@ msgstr ""
 "\n"
 "Známá jména LDISC (disciplíny linky):\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
@@ -11978,50 +12041,50 @@ msgstr ""
 "\n"
 "Známá jména IFLAG:\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "chybná rychlost: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach z %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "neplatný přepínač"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "neplatná disciplína linky: %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s není sériovou linkou"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "nelze zjistit vlastnosti terminálu %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "rychlost %d nepodporována"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "vlastnosti terminálu %s nelze nastavit"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "disciplínu linky nelze nastavit"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "nelze se démonizovat"
 
@@ -12183,15 +12246,14 @@ msgid "NUMA node%d CPU(s):"
 msgstr "CPU NUMA uzlu %d:"
 
 # FIXME: full stops at the end of some lines
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "Nástroj pro popis architektury CPU\n"
 "\n"
@@ -12201,26 +12263,22 @@ msgstr ""
 "  -s, --sysroot  použije adresář jako kořen nového systému\n"
 "  -x, --hex      vypíše šestnáctkové masky namísto seznamů CPU\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12229,12 +12287,12 @@ msgstr ""
 "\n"
 "Více informací naleznete v mount(8).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s: není adresářem"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s je již připojeno.\t"
@@ -12270,46 +12328,44 @@ msgstr ""
 "\t -n            zakáže autodetekci pořadí bytů\n"
 "\t -V            vypíše informace o verzi a skončí\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: chyba při zápisu %s: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Předpokládám opačné pořadí bajtů. Systémové pořadí lze vynutit pomocí -n.\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Profilovací_krok: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): chybný map řádek\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: „_stext“ nelze v %s nalézt\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: adresa profilu je mimo rozsah. Chybný mapovací soubor?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "celkem"
 
-#: sys-utils/renice.c:55
-#, c-format
+#: sys-utils/renice.c:56
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12321,10 +12377,8 @@ msgstr ""
 " %1$s [-n] PRIORITA  -u UŽIVATEL [UŽIVATEL…]\n"
 
 #: sys-utils/renice.c:62
-#, c-format
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12341,8 +12395,7 @@ msgstr ""
 " -u, --user JMÉNO|ID    interpretuje jako uživatelské jméno nebo ID\n"
 " -v, --version          zobrazí verzi\n"
 
-#: sys-utils/renice.c:70
-#, c-format
+#: sys-utils/renice.c:69
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12350,71 +12403,60 @@ msgstr ""
 "\n"
 "Více informací naleznete v reince(1).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice z %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, c-format
 msgid "unknown user %s"
 msgstr "neznámý uživatel: %s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, c-format
 msgid "bad value %s"
 msgstr "chybná hodnota %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr "ID procesu"
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 msgid "user ID"
 msgstr "ID uživatele"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr "ID skupiny procesů"
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "selhalo zjištění priority %d (%s)"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "selhalo nastavení priority %d (%s)"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d (%s): původní priorita %d, nová priorita %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Použití: %s [PŘEPÍNAČE]\n"
-"\n"
-"Přepínače:\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "    -d | --device ZAŘÍZENÍ    vybere RTC zařízení (rtc0|rtc1|…)\n"
 "    -n | --dry-run            provede vše až na uspání\n"
@@ -12427,8 +12469,7 @@ msgstr ""
 "    -v | --verbose            podrobné zprávy\n"
 "    -V | --version            zobrazí verzi\n"
 
-#: sys-utils/rtcwake.c:100
-#, c-format
+#: sys-utils/rtcwake.c:101
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12436,150 +12477,150 @@ msgstr ""
 "\n"
 "Více informací naleznete v rtcwake(8).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 msgid "read rtc time failed"
 msgstr "přečtení hodin RTC selhalo"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 msgid "read system time failed"
 msgstr "přečtení systémových hodin selhalo"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 msgid "convert rtc time failed"
 msgstr "převod času RTC selhal"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 msgid "set rtc alarm failed"
 msgstr "nastavení budíku RTC selgalo"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr "zapnutí budíku RTC selhalo"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr "nastavení budíku RTC pro probuzení selhalo"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 msgid "read rtc alarm failed"
 msgstr "přečtení budíku RTC selhalo"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr "budík: vypnut\n"
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 msgid "convert time failed"
 msgstr "převod času selhal"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr "budík: zapnut  %s"
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "nerozpoznaný režim spánku „%s“"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 msgid "failed to parse seconds value"
 msgstr "nezdařilo se rozebrat hodnotu sekund"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 msgid "failed to parse time_t value"
 msgstr "nezdařilo se rozebrat hodnotu time_t"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: předpokládám, že hodiny reálného času běží v UTC…\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Používám UTC čas.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Používám místní čas.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr "je nezbytné uvést čas probuzení (vizte přepínače -t a -s)"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s nemá dovoleno reagovat na probouzecí události"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "budík %ld, systémový_čas %ld, reálný_čas %ld, sekund %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr "hodiny nedojdou pozpátku k %s"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: probuzení za pomoci %s v %s"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: probuzení ze stavu „%s“ za pomoci %s v %s"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr "režim spánku: no (žádný); končí se\n"
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr "režim spánku: off (vypnuto); spouští se %s\n"
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, c-format
 msgid "unable to execute %s"
 msgstr "%s nelze spustit"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr "režim spánky: on (zapnuto); čte se RTC\n"
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 msgid "rtc read failed"
 msgstr "čtení hodin reálného času selhalo"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr "režim spánku: disable (zakázáno); budík se vypíná\n"
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr "režim spánku: show; zobrazí se údaje o budíku\n"
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr "reži spánku: %s; systém bude uspán\n"
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr "zakázání přerušení budíku hodin reálného času selhalo"
 
@@ -12651,17 +12692,17 @@ msgstr ""
 "%s: %s\n"
 "Více informací získáte příkazem „%s --help“.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: Nerozpoznaná architektura"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Málo argumentů"
 
 # personality – charakteristika architektury
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Selhalo nastavení charakteristiky architektury na %s"
@@ -12744,20 +12785,19 @@ msgstr "%s používá IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s používá poll\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "Použití: %s [PŘEPÍNAČE] <PROGRAM> [ARGUMENT…]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "Spustí program s některými jmennými prostory oddělenými od rodiče\n"
 "\n"
@@ -12767,8 +12807,7 @@ msgstr ""
 "  -i, --ipc         oddělí jmenný prostor System V IPC\n"
 "  -n, --net         oddělí síťový jmenný prostor\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12776,147 +12815,147 @@ msgstr ""
 "\n"
 "Více informací naleznete v unshare(1).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "volání unshare selhalo"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "číslo skupiny (GID) nelze nastavit"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "číslo uživatele (UID) nelze nastavit"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: %s nelze spustit: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "chyba: změna pracovního adresáře do %s."
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: proces „%s“ nelze nalézt\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: %s nelze spustit: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "outbuffer nelze alokovat"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "chybný časový limit: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Málo argumentů"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "outbuffer nelze alokovat"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "chybná rychlost %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "příliš mnoho alternativních rychlostí"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s nelze otevřít jako standardní vstup: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s není znakovým zařízením"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: není otevřeno pro čtení/zápis"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: volání dup selhalo: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "typ: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: přečteno: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: přetečení vstupu"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12928,69 +12967,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "uživatel"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "uživatelé"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 msgid "ttyname failed"
 msgstr "funkce ttyname selhala"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, c-format
 msgid "stat %s failed"
 msgstr "volání stat nad %s selhalo"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 msgid "is y"
 msgstr "Příjem zpráv je zapnut"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 msgid "is n"
 msgstr "Příjem zpráv je vypnut"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, c-format
 msgid "change %s mode failed"
 msgstr "změnit režim %s se nepodařilo"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "neplatný iflag: %s"
@@ -13006,54 +13039,48 @@ msgstr ""
 "Pokud jej opravdu chcete použít, tak zadejte „%s [PŘEPÍNAČE] %s“.\n"
 "Script nebyl spuštěn.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "časový soubor %s nelze otevřít"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script spuštěn. Soubor je %s.\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script spuštěn %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: skript soubor nelze zapsat, chyba: %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -13062,79 +13089,76 @@ msgstr ""
 "\n"
 "Script ukončen %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script utils. Soubor je %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "volání openpty selhalo\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Nejsou žádná další volná pty\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <ČASOVÝ_SOUBOR> [<ZÁZNAM_VSTUPU> [<DĚLITEL>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "očekáváno číslo, ale obdrženo „%s“"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "dělitel „%s“"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "zápis na standardní výstup selhal"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "neočekávaný konec souboru %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "načtení souboru se záznamem vstupu %s selhalo"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "neočekávaný počet argumentů"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "soubor %s se záznamem vstupu nelze otevřít"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "čtení z časového souboru %s selhalo"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "časový soubor %s: %lu: neočekávaný formát"
@@ -13145,50 +13169,47 @@ msgid "Argument error."
 msgstr "%s: Chybný přepínač, použití\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13197,61 +13218,61 @@ msgstr ""
 "\n"
 "Více informací naleznete v lsblk(8).\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "režim blank nelze vynutit\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "režim unblank nelze vynutit\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "stav režimu blank nelze zjistit\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "šetřící režim nelze vypnout/zapnout\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "zařízení %s nelze otevřít pro zápis\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "chyba klogctl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Chyba při ukládání obrazu obrazovky\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "%s nelze načíst\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: proměnná TERM není nastavena.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: neznámý signál %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13279,144 +13300,149 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "neplatný přepínač"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "chybný časový limit: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "dočasný soubor nelze otevřít"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "číslo uživatele (UID) nelze nastavit"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Velikost disku nelze zjistit"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Všeobecná zpráva od %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr "nebude se číst z %s – použijte standardní vstup."
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 msgid "fstat failed"
 msgstr "volání fstat selhalo"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 msgid "fread failed"
 msgstr "funkce fread selhala"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Použití: %s [PŘEPÍNAČE] NÁZEV_CESTY [NÁZEV_CESTY…]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: název Vašeho tty nelze zjistit\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: máte vypnut příjem zpráv.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: uživatel %s není na %s přihlášen.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: uživatel %s má na %s vypnut příjem zpráv\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: uživatel %s není přihlášen\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: uživatel %s má vypnut příjem zpráv\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "writing: uživatel %s je přihlášen vícekrát; píši na %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Vstupní řádek je příliš dlouhý."
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Zpráva od %s@%s (jako %s) na %s v %s…"
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Zpráva od %s@%s na %s v %s…"
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "funkce calloc selhala"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Použití: %s [PŘEPÍNAČE]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13613,7 +13639,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13820,7 +13846,7 @@ msgstr ""
 "\n"
 "Vzorek nebyl nalezen\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Vzorek nebyl nalezen"
 
@@ -13885,7 +13911,7 @@ msgstr "hexdump: chybný formát {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: chybný znak v konverzi %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13939,7 +13965,7 @@ msgstr ""
 "Podrobnosti se lze dozvědět z pg(1).\n"
 "-------------------------------------------------------\n"
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13947,81 +13973,81 @@ msgstr ""
 "%s: Použití: %s [-ČÍSLO] [-p ŘETĚZEC] [-cefnrs] [+ŘÁDEK] [+/VZOREK/] "
 "[SOUBOR…]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: volba „%s“ vyžaduje argument\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: neplatná volba -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "…skáču vpřed\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "…skáču vzad\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Žádný následující soubor"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Žádný předchozí soubor"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Chyba čtení ze souboru %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Neočekávaná značka konce souboru v %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Neznámá chyba v souboru %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Nelze vytvořit dočasný soubor\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Chyba regulárního výrazu: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(KONEC SOUBORU)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Žádný zapamatovaný řetězec pro vyhledání"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Nelze otevřít "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "uloženo"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !příkaz není dovolen v režimu rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() selhal, zkuste to později\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Další soubor: "
 
@@ -14096,8 +14122,8 @@ msgstr ""
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -14113,38 +14139,321 @@ msgstr "nezdařilo se rozebrat hodnotu time_t"
 msgid "no input file specified"
 msgstr "nezadán název souboru"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr ""
+"\n"
+"Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "chyba při čtení terminfo databáze"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "neznámá posloupnost řídicích znaků na vstupu: %o, %o"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 msgid "Input line too long."
 msgstr "Vstupní řádek je příliš dlouhý."
 
-#~ msgid "Usage:\n"
-#~ msgstr "Použití:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Chyba při zavírání souboru\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Lituji, můžete měnit značku neprázdných oddílů.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Varování: oddíl %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Varování: oddíly %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "a %s se navzájem překrývají.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Použití:\n"
+#~ "  %s [PŘEPÍNAČE] [ZAŘÍZENÍ…]\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "Zařízení: něco jako /dev/hda či /dev/sda"
+
+#~ msgid "success"
+#~ msgstr "úspěch"
+
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -a, --all               mount all filesystems mentioned in fstab\n"
+#~ " -f, --fake              dry run, skip mount(2) syscall\n"
+#~ " -F, --fork              fork off for each device (use with -a)\n"
+#~ " -h, --help              this help\n"
+#~ " -n, --no-mtab           don't write to /etc/mtab\n"
+#~ " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
+#~ " -v, --verbose           verbose mode\n"
+#~ " -V, --version           print version string\n"
+#~ " -w, --read-write        mount the filesystem read-write (default)\n"
+#~ " -o, --options <list>    comma separated string of mount options\n"
+#~ " -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
+#~ " -t, --types <list>      indicate the filesystem type\n"
+#~ " -c, --no-canonicalize   don't canonicalize paths\n"
+#~ " -i, --internal-only     don't call the mount.<type> helpers\n"
+#~ " -l, --show-labels       lists all mounts with LABELs\n"
+#~ "\n"
+#~ "Source:\n"
+#~ " -L, --label <label>     synonym for LABEL=<label>\n"
+#~ " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
+#~ " LABEL=<label>           specifies device by filesystem label\n"
+#~ " UUID=<uuid>             specifies device by filesystem UUID\n"
+#~ " <device>                specifies device by path\n"
+#~ " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
+#~ " <file>                  regular file for loopdev setup\n"
+#~ "\n"
+#~ "Operations:\n"
+#~ " -B, --bind              mount a subtree somewhere else (same as -o "
+#~ "bind)\n"
+#~ " -M, --move              move a subtree to some other place\n"
+#~ " -R, --rbind             mount a subtree and all submounts somewhere "
+#~ "else\n"
+#~ " --make-shared           mark a subtree as shared\n"
+#~ " --make-slave            mark a subtree as slave\n"
+#~ " --make-private          mark a subtree as private\n"
+#~ " --make-unbindable       mark a subtree as unbindable\n"
+#~ " --make-rshared          recursively mark a whole subtree as shared\n"
+#~ " --make-rslave           recursively mark a whole subtree as slave\n"
+#~ " --make-rprivate         recursively mark a whole subtree as private\n"
+#~ " --make-runbindable      recursively mark a whole subtree as unbindable\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Přepínače:\n"
+#~ " -a, --all               připojí veškeré souborové systémy uvedené ve "
+#~ "fstab\n"
+#~ " -f, --fake              zkušební režim, vynechá volání systému mount(2)\n"
+#~ " -F, --fork              pro každé zařízení vytvoří potomka (použít s -"
+#~ "a)\n"
+#~ " -h, --help              tato nápověda\n"
+#~ " -n, --no-mtab           nezapíše do /etc/mtab\n"
+#~ " -r, --read-only         souborový systém připojí jen pro čtení (stejné "
+#~ "jako\n"
+#~ "                         -o ro)\n"
+#~ " -v, --verbose           sdílný režim\n"
+#~ " -V, --version           vypíše verzi programu\n"
+#~ " -w, --read-write        souborový systém připojí pro čtení i zápis "
+#~ "(výchozí)\n"
+#~ " -o, --options SEZNAM    volby připojení oddělené čárkou\n"
+#~ " -O, --test-opts SEZNAM  omezí množinu souborových systémů (použít s -a)\n"
+#~ " -t, --types SEZNAM      určí druh souborového systému\n"
+#~ " -c, --no-canonicalize   cesty nepřevede na kanonický tvar\n"
+#~ " -i, --internal-only     nezavolá pomocný program mount.DRUH\n"
+#~ " -l, --show-labels       vypíše všechny připojené systémy a jejich "
+#~ "jmenovky\n"
+#~ "\n"
+#~ "Zdroj:\n"
+#~ " -L, --label JMENOVKA    synonymum pro LABEL=JMENOVKA\n"
+#~ " -U, --uuid UUID         synonymum pro UUID=UUID\n"
+#~ " LABEL=JMENOVKA          určí zařízené podle jmenovky systému souborů\n"
+#~ " UUID=UUID               určí zařízení podle UUID systému souborů\n"
+#~ " ZAŘÍZENÍ                určí zařízení podle cesty\n"
+#~ " ADRESÁŘ                 bod připojení pro vázaná připojení (vizte --bind/"
+#~ "rbind)\n"
+#~ " SOUBOR                  obyčejný soubor pro připojení přes loop "
+#~ "zařízení\n"
+#~ "\n"
+#~ "Operace:\n"
+#~ " -B, --bind              připojí podstrom někam jinam (stejné jako -o "
+#~ "bind)\n"
+#~ " -M, --move              přesune podstrom na jiné místo\n"
+#~ " -R, --rbind             připojí podstrom a všechny podřízené systémy "
+#~ "jinam\n"
+#~ " --make-shared           označí podstrom jako sdílený\n"
+#~ " --make-slave            označí podstrom jako podřízený\n"
+#~ " --make-private          označí podstrom jako soukromý\n"
+#~ " --make-unbindable       označí podstrom jako vázaně nepřipojitelný\n"
+#~ " --make-rshared          rekurzivně označí celý podstrom jako sdílený\n"
+#~ " --make-rslave           rekurzivně označí celý podstrom jako podřízený\n"
+#~ " --make-rprivate         rekurzivně označí celý podstrom jako soukromý\n"
+#~ " --make-runbindable      rekurzivně označí celý podstrom jako vázaně\n"
+#~ "                         nepřipojitelný\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -s, --fstab            search in static table of filesystems\n"
+#~ " -m, --mtab             search in table of mounted filesystems\n"
+#~ " -k, --kernel           search in kernel table of mounted \n"
+#~ "                        filesystems (default)\n"
+#~ "\n"
+#~ " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
+#~ " -w, --timeout <num>    upper limit in millisecods which --poll will "
+#~ "block\n"
+#~ "\n"
+#~ " -c, --canonicalize     canonicalize printed paths\n"
+#~ " -d, --direction <word> search direction - 'forward' or 'backward'\n"
+#~ " -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+#~ " -f, --first-only       print the first found filesystem only\n"
+#~ " -h, --help             print this help\n"
+#~ " -i, --invert           invert sense of matching\n"
+#~ " -l, --list             use list format output\n"
+#~ " -n, --noheadings       don't print headings\n"
+#~ " -u, --notruncate       don't truncate text in columns\n"
+#~ " -O, --options <list>   limit the set of filesystems by mount options\n"
+#~ " -o, --output <list>    output columns\n"
+#~ " -P, --pairs            use key=\"value\" output format\n"
+#~ " -r, --raw              use raw output format\n"
+#~ " -a, --ascii            use ascii chars for tree formatting\n"
+#~ " -t, --types <list>     limit the set of filesystem by FS types\n"
+#~ " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
+#~ " -R, --submounts        print all submount for the matching filesystems\n"
+#~ " -S, --source <string>  device, LABEL= or UUID=device\n"
+#~ " -T, --target <string>  mountpoint\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Volby:\n"
+#~ " -s, --fstab            hledá ve statické tabulce souborových systémů\n"
+#~ " -m, --mtab             hledá v tabulce připojených souborových systémů\n"
+#~ " -k, --kernel           hledá v jaderné tabulce připojených souborových\n"
+#~ "                        systémů (implicitní)\n"
+#~ "\n"
+#~ " -c, --canonicalize     cesty vypisuje v kanonickém tvaru\n"
+#~ " -d, --direction <SMĚR> směr hledání – „forward“ (dopředné) nebo\n"
+#~ "                        „backward“ (zpětné)\n"
+#~ " -e, --evaluate         všechny značky (jmenovky/UUID) před zobrazením\n"
+#~ "                        vyhodnotí\n"
+#~ " -f, --first-only       vypíše pouze první nalezený souborový systém\n"
+#~ " -h, --help             zobrazí tuto nápovědu\n"
+#~ " -i, --invert           obrátí smysl vyhledávacích pravidel\n"
+#~ " -l, --list             výstup ve formátu seznamu\n"
+#~ " -n, --noheadings       nezobrazí záhlaví\n"
+#~ " -u, --notruncate       nezkracuje text ve sloupcích\n"
+#~ " -O, --options <SEZNAM> omezí množinu souborových systémů podle voleb\n"
+#~ "                        připojení\n"
+#~ " -o, --output <SEZNAM>  zobrazí dané sloupce\n"
+#~ " -r, --raw              neformátovaný výstup\n"
+#~ " -a, --ascii            pro vykreslení stromu použije znaky ASCII\n"
+#~ " -t, --types <SEZNAM>   omezí množinu souborových systémů podle jejich "
+#~ "druhu\n"
+#~ " -v, --nofsroot         u vázaných nebo btrfs připojení nevypisuje [/"
+#~ "adresář]\n"
+#~ " -R, --submounts        u odpovídajících souborových systémů vypisuje "
+#~ "všechny\n"
+#~ "                        podřízené body přípojení\n"
+#~ " -S, --source <ŘETĚZEC> zařízení, LABEL= (jmenovka) nebo UUID=\n"
+#~ " -T, --target <ŘETĚZEC> bod připojení\n"
+#~ "\n"
+
+# TODO: plurals
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd bajtů ["
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Použití:\n"
+#~ " %1$s -a [-e] [-v] [-f]             zapne všechny odkládací oblasti\n"
+#~ "                                    uvedené v /etc/fstab\n"
+#~ " %1$s [-p PRIORITA] [-d] [-v] [-f] ZVLÁŠTNÍ\n"
+#~ "                                    zapne vybranou odkládací oblast\n"
+#~ " %1$s -s                            vypíše souhrnné informace o využití\n"
+#~ "                                    odkládacích oblastí\n"
+#~ " %1$s -h                            vypíše nápovědu\n"
+#~ " %1$s -V                            vypíše verzi\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Použití:\n"
+#~ " %1$s -a [-v]                      vypne všechny odkládací oblasti\n"
+#~ " %1$s [-v] ZVLÁŠTNÍ                vypne vybranou odkládací oblast\n"
+#~ " %1$s -h                           vypíše nápovědu\n"
+#~ " %1$s -V                           vypíše verzi\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Použití: %s [PŘEPÍNAČE] <NÁZEV_SOUBORU>\n"
+#~ "\n"
+#~ "Přepínače:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Použití: %s [PŘEPÍNAČE]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Použití: %s [PŘEPÍNAČE]\n"
+#~ "\n"
+#~ "Přepínače:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Použití: %s [PŘEPÍNAČE] [SOUBOR…]\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14284,32 +14593,12 @@ msgstr "Vstupní řádek je příliš dlouhý."
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [či --help]:      vypíše tuto nápovědu"
 
-#~ msgid "dangerous options:"
-#~ msgstr "Nebezpečné přepínače:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [či --show-geometry]:\n"
 #~ "                         vypíše informace o geometrii, které udržuje jádro"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [či --show-pt-geometry]:\n"
-#~ "                         vypíše informace o geometrii, která byla "
-#~ "odhadnuta\n"
-#~ "                         z tabulky rozdělení disku"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [či --show-extended]:\n"
-#~ "                         vypíše informace o rozšířených diskových\n"
-#~ "                         oddílech a na vstupu bude očekávat jejich popis"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14365,52 +14654,9 @@ msgstr "Vstupní řádek je příliš dlouhý."
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [volby] [--] řetězec-s-volbami přepínače\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [volby] -o|--options řetězec-s-volbami [volby] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              argumenty\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Akceptuje dlouhé volby začínající jedním "
-#~ "-\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Vypíše tuto nápovědu\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=dlouhvol   Rozpoznávané dlouhé volby\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=názevprog          Název, pod kterým jsou oznamovány chyby\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=krátvol        Rozpoznávané krátké volby\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Vypne oznamování chyb pomocí getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Žádný normální výstup\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr "  -s, --shell=shell            Nastaví konvence uzavíraní\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Testuje verzi getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 neuzavře výstup do uvozovek\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Vypíše informace o verzi\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (rozšířené) 1.1.4\n"
 
diff --git a/po/da.po b/po/da.po
index ffb3770c5..da2832fd3 100644
--- a/po/da.po
+++ b/po/da.po
@@ -48,8 +48,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-2.19-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2011-04-09 19:30+01:00\n"
 "Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
@@ -145,29 +145,29 @@ msgstr "genlæs partitionstabellen"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "få størrelse i 512-byte sektorer"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "kunne ikke åbne %s"
@@ -249,7 +249,7 @@ msgid "Verifying ... "
 msgstr "Verificerer... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Kan ikke åbne filen »%s«"
@@ -289,15 +289,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -310,7 +310,7 @@ msgstr "%s fra %s\n"
 msgid "cannot stat file %s"
 msgstr "kan ikke køre stat på enheden %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -359,8 +359,8 @@ msgid "stat failed: %s"
 msgstr "stat mislykkedes: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "open (åbn) mislykkedes: %s"
@@ -588,55 +588,55 @@ msgstr "ugyldig fildataforskydning"
 msgid "compiled without -x support"
 msgstr "kompileret uden understøttelse for -x"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: O.k.\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Brug: %s [-larvsmf] /dev/navn\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s er monteret.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Vil du virkelig fortsætte"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "tjek afbrudt.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zone-nr < FIRSTZONE i filen »%s«."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zone nr >= ZONES i filen »%s«."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Fjern blok"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Læsefejl: kunne ikke søge til blok i filen »%s«\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Læsefejl: ugyldig blok i filen »%s«\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -645,294 +645,294 @@ msgstr ""
 "Intern fejl: forsøger at skrive ugyldig blok\n"
 "Skriveforsøg ignoreret\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "søgning mislykkedes i write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Skrivefejl: Ugyldig blok i fil »%s«\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "søgning mislykkedes i write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "kunne ikke skrive super-blok"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Kunne ikke skrive inode-oversigten"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Kunne ikke skrive zone-oversigten"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Kunne ikke skrive inoder"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "søgning mislykkedes"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "kunne ikke allokere mellemlagre for superblok"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "kunne ikke læse super-blok"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "ugyldigt magisk nummer i super-blok"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Kun 1k blokke/zoner understøttes"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "ugyldigt s_imap_blocks-felt i super-blok"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "ugyldigt s_zmap_blocks-felt i super-blok"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Kunne ikke allokere mellemlager til inode-oversigt"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Kunne ikke allokere mellemlager til zoneoversigt"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Kunne ikke allokere mellemlager til inoder"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Kunne ikke allokere mellemlager til inode-optælling"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Kunne ikke allokere mellemlager til zoneoptælling"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Kunne ikke læse inode-oversigt"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Kunne ikke læse zoneoversigt"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Kunne ikke læse inoder"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Advarsel: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inoder\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blokke\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Førstedatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonestørrelse=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maksstørrelse=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Filsystem-tilstand=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "navnelængde=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d er markeret som ubrugt, men bruges af filen »%s«\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Marker i brug"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Filen »%s« har tilstand %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Advarsel: Antal inoder er for stort.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "rod-inode er ikke en mappe"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok blev brugt tidligere. Nu i filen »%s«."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Slet"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d i filen »%s« er markeret som ubrugt."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Korriger"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Mappen »%s« indeholder forkert inode-antal for filen »%.*s«."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Fjern"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: ugyldig mappe: ».« er ikke først\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: ugyldig mappe: »..« er ikke nummer to\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "intern fejl"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: ugyldig mappe: størrelse < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "mislykket søgning i bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Inode %d-tilstand ikke slettet."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inode %d ikke brugt, markeret som brugt i bitoversigten."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inode %d i brug, markeret som ubrugt i bitoversigten."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Sæt"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (tilstand = %07o), i_nlinks=%d, optalt=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Sæt i_nlinks til det optalte"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zone %d: markeret som brugt, ingen filer bruger den."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Afmarker"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zone %d: i brug, optalt=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zone %d: ikke i brug, optalt=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "ugyldig inode-størrelse"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "ugyldig v2 inode-størrelse"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "kræver terminal til interaktive reparationer"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "kunne ikke åbne »%s«: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s er i orden, tjekkes ikke.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Gennemtvinger tjek af filsystem på %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Filsystem på %s er måske ikke i orden, kræver et tjek.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -941,12 +941,12 @@ msgstr ""
 "\n"
 "%6ld inoder brugt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zoner brugt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -969,7 +969,7 @@ msgstr ""
 "------\n"
 "%6d filer\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1093,7 +1093,7 @@ msgstr "for mange inoder - øvre grænse er 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "ikke plads nok, kræver mindst %llu blokke"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhed: %s\n"
@@ -1263,10 +1263,8 @@ msgstr "%6.2f%% (%+ld byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Fejl ved lukning af fil\n"
+msgid "cannot close file %s"
+msgstr "Kan ikke åbne filen »%s«"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1378,88 +1376,98 @@ msgstr ""
 "ADVARSEL: enhedsnumre er afkortet til %u bit. Det betyder næsten med\n"
 "sikkerhed, at nogle af enhedsfilerne vil være fejlbehæftede.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Brug: %s [-c | -l filnavn] [-nXX] [-iXX] /dev/navn [blokke]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s er monteret; vil ikke oprette et filsystem her!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "mislykket søgning til opstartsblok i write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "kunne ikke slette opstartssektor"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "søgning mislykkedes i write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "kunne ikke skrive super-blok"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "kunne ikke skrive inode-oversigt"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "kunne ikke skrive zoneoversigt"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "kunne ikke skrive inoder"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "søgning mislykkedes i write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "mislykket skrivning i write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "for mange ugyldige blokke"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "ikke nok gyldige blokke"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "kunne ikke allokere mellemlagre for superblok"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "kunne ikke allokere mellemlagre til oversigter"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "kunne ikke allokere mellemlager til inoder"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inoder\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blokke\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1468,99 +1476,99 @@ msgstr ""
 "Maksstørrelse=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "søgning mislykkedes under test af blokke"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Mystiske værdier i do_check: sandsynligvis programfejl\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "søgning mislykkedes i check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "ugyldige blokke før dataområde: kan ikke oprette filsystem"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d ugyldige blokke\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "en ugyldig blok\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "kan ikke åbne fil med ugyldige blokke"
 
 # den her kan jeg ikke fortolke.  Måske:
 # badblock-talinddatafejl på...
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "talinddatafejl af typen badblock på linje %d\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "kan ikke læse badblocks-fil"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "ugyldig inode-størrelse"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol-fejl: antallet af blokke ikke angivet"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat mislykkedes"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: åbn mislykkedes"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: enhed er optaget"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "blokstørrelse mindre end fysisk sektorstørrelse på %s"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "kan ikke bestemme størrelse på %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "vil ikke forsøge at oprette filsystem på »%s«"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "for lille antal blokke"
@@ -1902,7 +1910,7 @@ msgstr "etiket er for lang. Forkorter den til »%s«"
 msgid "%s: failed to write label"
 msgstr "%s: kunne ikke skrive etiket"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2250,7 +2258,7 @@ msgid "   Logical"
 msgstr "   Logisk"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Ukendt"
 
@@ -2915,12 +2923,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD-disketiketkommando (m for hjælp): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Første %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sidste %s eller +størrelse eller +størrelseM eller +størrelseK"
@@ -3066,7 +3074,7 @@ msgid "tracks/cylinder"
 msgstr "spor/cylinder"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cylindre"
 
@@ -3133,12 +3141,12 @@ msgstr "Det maksimale antal partitioner er blevet oprettet\n"
 msgid "This partition already exists.\n"
 msgstr "Denne partition findes allerede.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Advarsel: For mange partitioner (%d, maksimum er %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3356,7 +3364,7 @@ msgstr "Du skal angive"
 msgid "heads"
 msgstr "hoveder"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektorer"
 
@@ -3806,7 +3814,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Opstart   Start         Slut     Blokke   Id  System\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Enhed"
 
@@ -3891,7 +3899,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "Tilbageværende %lld ikke-allokerede %d-byte sektorer\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -4051,37 +4059,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Synkroniserer diske.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har intet dataområde\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Ny begyndelse på data"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Ekspertkommando (m for hjælp): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Antal cylindre"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Antal hoveder"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Advarsel: sætter sektorforskydning for DOS-kompatilitet\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4094,32 +4102,32 @@ msgstr ""
 "understøtter ikke GPT. Brug GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s indeholder ikke en gyldig partitionstabel\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan ikke åbne %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ukendt kommando\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Denne kerne finder selv sektorstørrelser - tilvalget -b ignoreres\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4128,16 +4136,16 @@ msgstr ""
 "Advarsel: Tilvalget -b (angiv sektorstørrelse) kræver angivelse af "
 "diskenhed\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Detekterede en OSF/1-disketiket på %s. Går i tilstanden disketiket.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Kommando (m for hjælp): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4146,16 +4154,16 @@ msgstr ""
 "\n"
 "Den nuværende opstartsfil er: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Angiv venligt navnet på den nye opstartsfil: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartsfil uændret\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4474,9 +4482,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tDu har valgt et usædvanligt navn på opstartsfilen.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Beklager. Du må ændre mærket (tag) på ikke-tomme partitioner.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Beklager, kun superbrugeren kan ændre systemuret.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4492,7 +4500,7 @@ msgstr ""
 "Kun »SGI volume« hele-disksektionen kan bryde dette.\n"
 "Skriv JA, hvis du er sikker på, at du vil mærke partitionen anderledes.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -4696,7 +4704,7 @@ msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ubenyttet hul - sektorerne %d­%d\n"
 
 # 'nogle' tror jeg er bedre her, det er muligt at 'nogen' også er rigtigt
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4705,7 +4713,7 @@ msgstr ""
 "Disken er allerede helt udfyldt med andre partitioner.\n"
 "Slet eller formindsk nogle af dem, før du prøver igen.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4714,12 +4722,12 @@ msgstr ""
 "Det anbefales kraftigt, at den tredje partition dækker hele disken\n"
 "og er af typen »Hele disken«\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d er allerede allokeret\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4730,7 +4738,7 @@ msgstr ""
 "%d %s dækker en anden partition. Din indgang er blevet ændret til\n"
 "%d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4739,7 +4747,7 @@ msgstr ""
 "Hvis du vil beholde SunOS/Solaris-kompatilitet, bør du beholde denne\n"
 "partition som »Hele disken« (5), der begynder på 0, med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4753,7 +4761,7 @@ msgstr ""
 "og opstartsblok. Skriv JA hvis du er helt sikker på, at du vil\n"
 "markere den partition som Linux-swap (82): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4774,7 +4782,7 @@ msgstr ""
 "Enheder = %s a %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4787,28 +4795,28 @@ msgstr ""
 "Enheder = %s á %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Slut   Blokke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Antal alternative cylindre"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Ekstra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Interleavefaktor"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighed (omdr. per minut)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Antal fysiske cylindre"
 
@@ -5265,7 +5273,7 @@ msgstr "Disk %s: kan ikke bestemme geometrien\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan ikke bestemme størrelsen\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5276,22 +5284,22 @@ msgstr ""
 "hel disk. Brug af fdisk på den er sikkert meningsløst.\n"
 "[Brug tilvalget --force hvis du virkelig gerne vil]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Advarsel: HDIO_GETGEO siger, at der er %lu hoveder\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Advarsel: HDIO_GETGEO siger, at der er %lu sektorer\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Advarsel: BLKGETSIZE/HDIO_GETGEO siger, at der er %lu cylindre\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5300,7 +5308,7 @@ msgstr ""
 "Advarsel: Usandsynligt antal sektorer (%lu) - normalt højst 63\n"
 "Dette vil give problemer med alle programmer, der bruger C/H/S-adressering.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5309,14 +5317,14 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindre, %lu hoveder, %lu sektorer/spor\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s for partition %s har umulig hovedværdi: %lu (burde være mellem 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5324,7 +5332,7 @@ msgid ""
 msgstr ""
 "%s for partition %s har umulig sektorværdi: %lu (burde være mellem 1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5332,7 +5340,7 @@ msgid ""
 msgstr ""
 "%s for partition %s har umulig cylinderværdi: %lu (burde være mellem 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5341,12 +5349,12 @@ msgstr ""
 "Id  Navn\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Genindlæser partitionstabel ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5356,26 +5364,26 @@ msgstr ""
 "Kør partprobe(8), kpartx(8) eller genstart dit system nu,\n"
 "før du bruger mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fejl ved lukning af %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ingen sådan partition\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "ukendt format - benytter sektorer\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "ikke-implementeret format - benytter %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5384,12 +5392,12 @@ msgstr ""
 "Enheder = cylindre á %lu byte, blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start     Slut  #cyldr.  #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5398,12 +5406,12 @@ msgstr ""
 "Enheder = sektorer á 512 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhed  Opstart Start       Slut  #sektorer Id  System\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5414,14 +5422,14 @@ msgstr ""
 
 # Mon ikke tabellen ser o.k. ud hvis Opstrt rykkes en til venstre, så
 # a'et kan komme med
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhed Opstart Start       Slut   #blokke   Id  System\n"
 
 # (programmet skelner mellem megabyte = 1000*1000 byte og mebibyte =
 # 1024*1024 byte) evt. 'tæller fra' jf. de tidl.
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5430,31 +5438,31 @@ msgstr ""
 "Enheder = mebibyte á 1048576 byte, blokke á 1024 byte, tæller fra %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhed  Opst Start   Slut   MiB    #blokke   Id  System\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tstart: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutter på cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Fandt ingen partitioner\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5465,51 +5473,41 @@ msgstr ""
 "   til C/H/S=*/%ld/%ld (i stedet for %ld/%ld/%ld).\n"
 "I denne visning vil jeg gå ud fra denne geometri.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "der er ingen partitionstabel.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "mærkeligt, kun %d partitioner er defineret.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men er ikke markeret tom\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Advarsel: partition %s har størrelsen 0 og er en opstartspartition\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Advarsel: partition %s har størrelsen 0, men starter ikke i 0\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Advarsel: partition %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "indeholdes ikke i partition %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Advarsel: partitionerne %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "og %s overlapper hinanden\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Advarsel: partition %d er tom\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5518,17 +5516,17 @@ msgstr ""
 "Advarsel: partitionen %s indeholder en del af partitionstabellen (sektor\n"
 "%lu), og vil ødelægge denne, når der skrives til partitionen.\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Advarsel: partition %s starter i sektor 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Advarsel: partition %s når ud over diskens slutning\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5536,17 +5534,17 @@ msgstr ""
 "Kun én af primærpartitionerne må være udvidet\n"
 " (dette er dog ikke noget problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Advarsel: Partition %s starter ikke på en cylindergrænse\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Advarsel: Partition %s slutter ikke på en cylindergrænse\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5555,7 +5553,7 @@ msgstr ""
 "Dette generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne "
 "disk.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5563,7 +5561,7 @@ msgstr ""
 "Advarsel: Normalt kan man kun starte op fra primærpartitioner\n"
 "LILO ignorerer opstartsflaget.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5571,33 +5569,33 @@ msgstr ""
 "Advarsel: Ingen primærpartition er markeret opstartbar (aktiv)\n"
 "Det generer ikke LILO, men DOS MBR vil ikke kunne starte op fra denne disk.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "start"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: start: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "slut"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: slut: (c,h,s) forventede (%ld,%ld,%ld) fandt (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutter på cylinder %ld, efter diskens slutning\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5606,7 +5604,7 @@ msgstr ""
 "Advarsel: Ændrede starten på udvidet partition fra %ld til %ld\n"
 "(Vedrører kun oplistningen. Ændrer ikke indholdet.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5614,133 +5612,133 @@ msgstr ""
 "Advarsel: Udvidet partition starter ikke på en cylindergrænse.\n"
 "DOS og Linux vil opfatte indholdet forskelligt.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "for mange partitioner - ignorerer dem efter nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "træ med partitioner?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "fandt Disk Manager - kan ikke håndtere sådan en\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "Fandt DM6-signatur - opgiver\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "mærkeligt..., en udvidet partition med størrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "mærkeligt..., en BSD-partition med størrelsen 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: Ukendt partitionstabeltype\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flaget -n blev givet: Intet ændret\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Kunne ikke gemme de gamle sektorer- afbryder\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Mislykket skrivning af partition på %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "lang eller uafsluttet inddatalinje - afbryder\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "inddatafejl: forventer »=« efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "inddatafejl: uventet tegn %c efter %s-felt\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "ukendt inddata: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "tal for stort\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "uvedkommende tegn efter tallet\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "ikke plads til partitionsbeskrivelse\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "kunne ikke opbygge den omgivende udvidede partition\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "for mange inddatafelter\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Ikke plads til mere\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Ugyldig type\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Advarsel: Den angivne størrelse(%lu) overstiger den maksimalt tilladte "
 "(%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Advarsel: Tom partition\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Advarsel: Ugyldig partitionsbegyndelse (tidligst %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "ukendt opstartsflag, vælg - eller *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "delvis c,h,s-specifikation?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Udvidet partition ikke hvor den forventedes\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "ugyldige inddata\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "for mange partitioner\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5750,99 +5748,180 @@ msgstr ""
 "<start> <størr> <type [E,S,L,X,hex]> <opstartsflag [-,*]> <c,h,s> <c,h,s>\n"
 "Du behøver normalt kun at angive <start> og <størr> (og måske <type>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Brug: %s [tilvalg] enhed ...\n"
+msgstr "Brug:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "enhed: noget lignende /dev/hda eller /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Tilvalg:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "farlige tilvalg:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [eller --show-geometry]: vis kernens bud på den geometri ud fra\n"
+"                                partitionstabellen"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [eller --show-extended]: medtag udvidede partitioner i uddata\n"
+"                                eller forvent beskrivelser for dem i inddata"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Brug:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhed\t\t vis aktive partitioner på enhed\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhed n1 n2 ... aktiver partitionerne på n1 ..., deaktiver resten\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhed\t aktiver partition n, deaktiver de andre\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5855,63 +5934,63 @@ msgstr ""
 "understøttes ikke af GPT. Brug GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Brug flaget --force for at undertrykke dette tjek.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "ingen kommando?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "i alt: %llu blokke\n"
 
 # Det er separate symboler på kommandolinjen, så mellemrum:
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "brug: sfdisk --print-id enhed partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "brug: sfdisk --change-id enhed partitionsnummer id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "brug: sfdisk --id enhed partitionsnummer [id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "du kan kun angive én enhed (undtagen med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kunne ikke åbne %s til skrivning\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kunne ikke åbne %s til læsning\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindre, %ld hoveder, %ld sektorer/spor\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan ikke få størrelsen %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ugyldig aktiv-byte: 0x%x i stedet for 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5919,7 +5998,7 @@ msgstr ""
 "Færdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5928,35 +6007,35 @@ msgstr ""
 "Du har %d aktive primærpartitioner. Dette generer ikke LILO,\n"
 "men DOS MBR vil kun kunne starte op fra en disk med én aktiv partition.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x og er ikke skjult\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ugyldig id %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Denne disk er i brug for øjeblikket.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatal fejl: kunne ikke finde %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Advarsel: %s er ikke en blokenhed\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Tjekker, at ingen benytter denne disk for øjeblikket...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5969,30 +6048,30 @@ msgstr ""
 "Afmonter alle filsystemer og swapoff alle swappartitioner på denne disk.\n"
 "Brug flaget --no-reread for at undertrykke dette tjek.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Brug flaget --force for at undertrykke alle tjek.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "O.k.\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Gammel situation:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d findes ikke. Kan ikke ændre den\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -6000,7 +6079,7 @@ msgstr ""
 "Jeg kan ikke lide disse partitioner - intet blev ændret.\n"
 "(Hvis du virkelig ønsker det, kan du bruge flaget --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jeg kan ikke lide dette her - du bør nok svare nej (n)\n"
 
@@ -6008,17 +6087,17 @@ msgstr "Jeg kan ikke lide dette her - du bør nok svare nej (n)\n"
 # af ynq, hvilket er temmelig usmart.  Jeg har skrevet til
 # Report-Msgid-Bugs-To-adressen.  Men det bliver i hvertfald nødt til at
 # være ynq.
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Er du tilfreds med dette? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vil du virkelig skrive dette til disken? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -6027,16 +6106,16 @@ msgstr ""
 "\n"
 "sfdisk: inddata sluttede for tidligt\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Afslutter - intet blev ændret\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svar venligst y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6045,7 +6124,7 @@ msgstr ""
 "Skrivning af ny partitionstabel lykkedes\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6076,26 +6155,28 @@ msgstr "Synkroniserer diske.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s lykkedes.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s mislykkedes.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "ADVARSEL: Kunne ikke åbne %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "ADVARSEL: Ugyldigt format på linje %d af %s\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -6107,37 +6188,37 @@ msgstr ""
 "\tfil /etc/fstab, så snart det er muligt.\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: ikke fundet\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s: vent: Ikke flere underprocesser?!?\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "Advarsel... %s for enhed %s afsluttede med signal %d.\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s %s: status er %x, bør aldrig ske.\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Afsluttede med %s (afslutningsstatus %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: Fejl %d under kørsel af fsck.%s for %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6146,7 +6227,7 @@ msgstr ""
 "Enten alle eller ingen af filsystemtyperne videresendt til -t skal være\n"
 "foranstillet med »nej« eller »!«.\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
@@ -6154,33 +6235,33 @@ msgstr ""
 "%s: Springer ugyldig linje i /etc/fstab over: bind montering med fcsk-pass-"
 "tal der er forskelligt fra nul\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: springer enhed der ikke findes over\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck: kan ikke tjekke %s: fsck.%s blev ikke fundet\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "Tjekker alle filsystemer.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--venter-- (gennemgang %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6188,60 +6269,60 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: for mange enheder\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Kunne ikke åbne %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "Er /proc monteret?\n"
 
 # tror matching er 'passende' til et eller andet kriterium, ikke
 # nødvendigvis ens
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Skal være root (rod) for at skanne for passende filsystemer: %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Kunne ikke finde filsystem der stemmer overens: %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: For mange parametre\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6267,33 +6348,78 @@ msgstr "tomt langt ­tilvalg efter -l eller parameteren --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "ukendt skal efter -s eller parameteren --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [tilvalg] -o|--options tilvalgsstreng [tilvalg] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            Tillad lange tilvalg med enkelt -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Denne lille manual\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=langtilvalg  Lange tilvalg, der skal genkendes\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=prognavn          Navnet som fejl skal rapporteres under\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=tilvalgsstreng Korte tilvalg, der skal genkendes\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
+"  -q, --quiet                  Undertryk fejlrapportering fra getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Ingen normale uddata\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=skal             Angiv konventioner for anførselstegn\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Tjek versionen af getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 Indskyd ikke anførselstegn i uddata\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Vis versionsinformation\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "mangler tilvalgsstrengparameter"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "intern fejl, kontakt programmøren."
 
@@ -6758,81 +6884,99 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kunne ikke sætte epokeværdien i kernen.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Tilvalg:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       angiv hvilken slags alpha du har (se hwclock(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Kunne ikke forbinde til auditsystemet.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "kunne ikke fortolke pid"
@@ -6840,12 +6984,12 @@ msgstr "kunne ikke fortolke pid"
 # "%s accepterer kun tilvalgsparametre. ..."
 # (altså man kan ikke skrive 'hwclock hello', men man kan måske skrive
 # 'hwclock --someoption hello')
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s accepterer kun tilvalgsparametre. Du angav parameteren %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6854,7 +6998,7 @@ msgstr ""
 "Du har angivet flere funktionstilvalg.\n"
 "Du kan kun udføre én funktion ad gangen.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6862,7 +7006,7 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --utc og --localtime udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6870,7 +7014,7 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --adjust og --noadjfile udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6878,39 +7022,39 @@ msgid ""
 msgstr ""
 "%s: Tilvalgene --adjfile og --noadjfile udelukker hinanden. Du angav begge.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: --noadjfile kræver enten --utc or --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Ingen brugbar tid at sætte til. Kan ikke sætte uret.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Beklager, kun superbrugeren kan ændre maskinuret.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Beklager, kun superbrugeren kan ændre systemuret.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr ""
 "Beklager, kun superbrugeren kan ændre maskinurets epokeværdi i kernen.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "Kan ikke tilgå maskinuret med nogen kendt metode.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7092,7 +7236,7 @@ msgid "failed to read mtab"
 msgstr "kunne ikke læse: %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr "kunne ikke initialisere libmount-iterator"
 
@@ -7139,45 +7283,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7186,27 +7370,27 @@ msgstr ""
 "\n"
 "For yderligere information se findmnt(1).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: montering mislykkedes"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "kunne ikke fortolke pid"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "kunne ikke indhente pid %d's attributter"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "kunne ikke allokere udmellemlager"
@@ -7293,7 +7477,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: PAM-fejl, afbryder: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Adgangskode: "
 
@@ -7745,47 +7929,48 @@ msgstr "VOLDSOMT MANGE linjeskift"
 msgid "too many bare linefeeds."
 msgstr "for mange tomme linjeskift.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Logind udløb efter %d sekunder\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Sidste logind: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "fra %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "skrivning til standard-ud mislykkedes"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGINDFEJL FRA %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGINDFEJL på %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGINDFEJL fra %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGINDFEJL PÅ %s, %s"
@@ -7815,7 +8000,7 @@ msgstr "mount: adgang nægtet"
 msgid "setuid failed"
 msgstr "setuid() mislykkedes"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "exec %s mislykkedes"
@@ -7861,8 +8046,8 @@ msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: kunne ikke fjerne låsen på %s: %s (dine ændringer er stadig i %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "forgrening mislykkedes"
 
@@ -7914,24 +8099,21 @@ msgstr "ugyldig årsværdi: brug 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "brug: cal [-13smjyV] [[[dag] måned] år]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -8044,32 +8226,32 @@ msgid "failed to add line to output"
 msgstr "kunne ikke tilføje linje til uddata"
 
 # evt. "i linje "
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "fortolkningsfejl på linje: "
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "kunne ikke initialisere libmount-tabel"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "kan ikke læse: %s"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "kunne ikke initialisere libmount-tabel"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "hukommelsesallokering mislykkedes (malloc)"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8086,73 +8268,74 @@ msgstr ""
 " %1$s [tilvalg] <enhed> <monteringspunkt>\n"
 " %1$s [tilvalg] [--source <enhed>] [--target <monteringspunkt>]\n"
 
-#: misc-utils/findmnt.c:770
-#, fuzzy, c-format
+#: misc-utils/findmnt.c:772
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
-"\n"
-"Tilvalg:\n"
-" -s, --fstab            søg i statisk tabel for filsystemer\n"
-" -m, --mtab             søg i tabel over monterede filsystemer\n"
-" -k, --kernel           søg i kernens tabel over monterede \n"
-"                        filsystemer (standard)\n"
-"\n"
-" -c, --canonicalize     kanoniser udskrevne stier\n"
-" -d, --direction <ord>  søgeretning - »fremad« eller »tilbage«\n"
-" -e, --evaluate         vis alle MÆRKER (ETIKET/UUID), der er evalueret\n"
-" -f, --first-only       vis kun det først fundne filsystem\n"
-" -h, --help             vis denne hjælpetekst\n"
-" -i, --invert           vend matchbetydningen om\n"
-" -l, --list             brug listeformat for uddata\n"
-" -n, --noheadings       vis ikke overskrifter\n"
-" -u, --notruncate       afkort ikke tekst i kolonner\n"
-" -O, --options <liste>  begræns filsystemer efter monteringstilvalg\n"
-" -o, --output <liste>   uddatakolonner\n"
-" -r, --raw              brug råt format for uddata\n"
-" -a, --ascii            brug ascii-tegn til træformatering\n"
-" -t, --types <liste>    begræns filsystemer efter FS-typer\n"
-" -S, --source <streng>  enhed, ETIKET= eller UUID=enhed\n"
-" -T, --target <streng>  monteringspunkt\n"
-"\n"
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Tilgængelige kommandoer:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
@@ -8161,21 +8344,21 @@ msgstr ""
 "\n"
 "For yderligere information se findmnt(1).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr "tilvalg udelukker hinanden"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr "ukendt retning »%s«"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "kunne ikke fortolke pid"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
@@ -8183,20 +8366,20 @@ msgstr ""
 "tilvalgene --target og --source kan ikke bruges sammen med "
 "kommandolinjeelement som ikke er et tilvalg"
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr "kunne ikke initialisere libmount-mellemlager"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr "kunne ikke initialisere uddatatabel"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr "kunne ikke initialisere uddatakolonne"
 
@@ -8220,12 +8403,12 @@ msgstr "%s: kunne ikke finde processen »%s«\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: ukendt signal %s; gyldige signaler:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "brug: %s [ -s signal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signal ]\n"
@@ -8245,85 +8428,84 @@ msgstr "sokkel: %s.\n"
 msgid "connect %s"
 msgstr "forbind: %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "sokkel"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "forbind"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Brug: %s [tilvalg]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Næste fil: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "kunne ikke fortolke prioritet"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Værdi uden for området.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: ukendt facilitetsnavn: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: ukendt prioritetsnavn: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8463,7 +8645,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: Kunne ikke søge (seek) til swap-etiket"
 
 #: misc-utils/lsblk.c:809
@@ -8481,12 +8663,13 @@ msgstr "%s: Kunne ikke åbne"
 msgid "failed to parse list '%s'"
 msgstr "kunne ikke fortolke %s %s"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8494,7 +8677,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8517,7 +8700,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8526,33 +8709,33 @@ msgstr ""
 "\n"
 "For yderligere information se swaplabel(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Brug: %s [tilvalg]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Kunne ikke åbne %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Fik %d byte fra %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "kørsel af %s mislykkedes"
@@ -8572,26 +8755,15 @@ msgstr "kunne ikke køre stat på »%s«"
 msgid "%s - No such file or directory\n"
 msgstr "%s: kræver filbeskrivelse, fil eller mappe\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Brug: %s [tilvalg] stinavn [stinavn ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Tilvalg:\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8610,8 +8782,7 @@ msgstr ""
 " -n, --nosymlinks    følg ikke symbolske henvisninger\n"
 " -v, --vertical      lodret justering af tilstande og ejere\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8619,12 +8790,12 @@ msgstr ""
 "\n"
 "For yderligere information se namei(1).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "parametret til --date er for langt\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s: Oversteg begrænsning på symbolske henvisninger"
@@ -8634,166 +8805,164 @@ msgstr "%s: Oversteg begrænsning på symbolske henvisninger"
 msgid "renaming %s to %s failed"
 msgstr "%s: kunne ikke omdøbe %s til %s: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "ugyldige parametre"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "skriv"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "læs antal"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "ugyldig svarlængde"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "Kunne ikke åbne/oprette %s: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "Kunne ikke låse %s: %s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "dæmonen uuidd kører allerede på pid %s\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "Kunne ikke oprette unixstrømsokkel: %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Kunne ikke binde unixsokkel %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Kunne ikke lytte på unixsokkel %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Fejl ved læsning fra klient, len = %d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "handling %d, indgående num = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr "handling %d\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "Genererede tid UUID: %s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "Genererede vilkårlig UUID: %s\n"
 
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "Genererede tid UUID %s og %d følger\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "Genererede tid UUID %s og %d følger\n"
+msgstr[1] "Genererede tid UUID %s og %d følger\n"
 
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "Genererede %d UUID'er:\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "Genererede %d UUID'er:\n"
+msgstr[1] "Genererede %d UUID'er:\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "Ugyldig handling %d\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "Uventet svarlængde fra server %d\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "Ugyldigt tal: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Fejl ved kald af dæmonen uuidd (%s): %s\n"
 
-#: misc-utils/uuidd.c:546
-#, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s og efterføglende %d UUID'er\n"
+#: misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s og efterføglende %d UUID'er\n"
+msgstr[1] "%s og efterføglende %d UUID'er\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "Liste af UUID'er:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "Kunne ikke dræbe uuidd der kører ved pid %d: %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "Dræbte uuidd der kører ved pid %d\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8801,29 +8970,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8862,32 +9030,34 @@ msgid "%s: write failed"
 msgstr "%s: skrivning mislykkedes"
 
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd byte ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] slettet ved forskydning 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "ugyldig forskydningsværdi »%s« angivet"
 
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
 # den sidste må være noget med om udskriften kan fortolkes af et
 # menneske (printable format) eller en maskine (parsable).
 # eller måske udskriv i fortolknings- frem for læseformat
-#: misc-utils/wipefs.c:306
-#, fuzzy, c-format
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 " -a, --all           fjern alle magiske strenge (VÆR FORSIGTIG!)\n"
 " -h, --help          denne hjælpetekst\n"
@@ -8895,7 +9065,7 @@ msgstr ""
 " -o, --offset <num>  forskydning at slette, i byte\n"
 " -p, --parsable      udskriv i fortolknings- frem for læseformat\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8904,11 +9074,11 @@ msgstr ""
 "\n"
 "For yderligere information se wipefs(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "--offset og --all udelukker hinanden"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -9000,63 +9170,63 @@ msgstr "fejl ved ændring af ejer af %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "kunne ikke omdøbe %s til %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: mappen /dev findes ikke."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: kan ikke angive kapacitet på enhed %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", forskydning %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", størrelsesgrænse %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", kryptering %s (type %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", forskydning %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", krypteringstype %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kunne ikke få oplysninger om enheden %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kunne ikke åbne enheden %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: ingen rettighed til at kigge i /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kunne ikke finde nogen ledig løkkeenhed (loop device)"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -9066,11 +9236,11 @@ msgstr ""
 "       denne kerne ikke til løkkeenheder? (I så fald, genoversæt\n"
 "       eller »modprobe loop«.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Løb tør for hukommelse under læsning af adgangsfrase"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "advarsel: %s er allerede associeret med %s\n"
@@ -9082,47 +9252,45 @@ msgstr "advarsel: %s er allerede associeret med %s\n"
 # Her er den lille forskel så (synes jeg) at det er lidt klarere at
 # programmet justerer sin egen kørsel for at tage højde for det, det
 # arbejder på.
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "advarsel: %s: er skrivebeskyttet, bruger derfor som skrivebeskyttet.\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunne ikke låse ind i hukommelsen, afslutter.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD mislykkedes: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): lykkedes\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): lykkedes\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kunne ikke slette enheden %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Denne montering er oversat uden løkkeunderstøttelse. Genoversæt venligst.\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9130,7 +9298,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Brug:\n"
@@ -9143,19 +9311,17 @@ msgstr ""
 "<fil>\n"
 " %1$s [ tilvalg ] {-f|--find|loopdev} <fil>   opsætning\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9170,32 +9336,32 @@ msgstr ""
 " -v | --verbose           uddybende tilstand\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "%s: ugyldig forskydningsværdi »%s« angivet"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "%s: ugyldig størrelsesbegrænsning »%s« angivet"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Løkkeenhed er %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "stjålet loop=%s...forsøger igen\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: enhed er optaget"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9779,14 +9945,17 @@ msgstr "programfejl i xstrndup-kald"
 msgid "not enough memory"
 msgstr "ikke nok hukommelse"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "Parameteren <speciel>:\n"
@@ -9796,109 +9965,96 @@ msgstr ""
 " <fil>                                navn på fil der skal bruges\n"
 "\n"
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Brug:\n"
-" %1$s -a [-e] [-v] [-f]             aktiver alle swap fra /etc/fstab\n"
-" %1$s [-p priority] [-v] [-f] <speciel>  aktiver angivet swap\n"
-" %1$s -s                            vis forbrugsreferat for swap\n"
-" %1$s -h                            vis hjælp\n"
-" %1$s -V                            vis version\n"
-"\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Brug:\n"
-" %1$s -a [-v]                      deaktiver alle swap\n"
-" %1$s [-v] <speciel>               deaktiver angivet swap\n"
-" %1$s -h                           vis hjælp\n"
-" %1$s -V                           vis version\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Uventet filformat"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: Geninitialiserer swappen."
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "execv mislykkedes"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "waitpid mislykkedes"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek mislykkedes"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: skrivningssignatur mislykkedes"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 "%s: fandt swapsignatur: version %d, sidestørrelse %d, %s byterækkefølge"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "forskellig"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "ens"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: usikre tilladelser %04o, %04o anbefales."
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: usikre tilladelser %04o, %04o anbefales."
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: springer over - den lader til at være fragmenteret."
 
 # Hent størrelse mislykkedes
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: Kunne ikke finde størrelse"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: Læsning af swaphoved mislykkedes"
@@ -9906,22 +10062,22 @@ msgstr "%s: Læsning af swaphoved mislykkedes"
 # uhh forsigtig her, det der kunne godt være noget som er en del af en
 # syntaks. Jeg tror det dog ikke, men det ville være meget rart at være
 # sikker.
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr "%s: sidestørrelse=%d, swapstørrelse=%llu, enhedsstørrelse=%llu"
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr "%s: sidste_side 0x%08llx er større end aktuel størrelse på swapplads"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: swapformatets sidestørrelse er ikke ens."
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9929,36 +10085,36 @@ msgstr ""
 "%s: swapformatets sidestørrelse er ikke ens. (Brug --fixpgsz til at "
 "geninitialisere den.)"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr "%s: Hviledata for software detekteret. Genskriver swapsignaturen."
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon mislykkedes"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "kan ikke finde enheden for %s"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "Ikke superbruger."
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff mislykkedes"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10237,7 +10393,7 @@ msgstr "Partition %d er valgt\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10297,19 +10453,13 @@ msgstr "        (%s-partitionstabel detekteret). "
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Disk %s indeholder ikke en gyldig partitionstabel\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10320,21 +10470,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Tilgængelige kommandoer:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10343,27 +10492,27 @@ msgstr ""
 "\n"
 "For yderligere information se setarch(8).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "tilvalg udelukker hinanden"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "kunne ikke fortolke prioritet"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "tilvalg udelukker hinanden"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "kunne ikke initialisere linjemellemlager.\n"
@@ -10526,7 +10675,7 @@ msgstr "kunne ikke angive pid %d's politik"
 msgid "failed to set pid %d's policy"
 msgstr "kunne ikke angive pid %d's politik"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "kunne ikke køre %s"
@@ -10816,7 +10965,7 @@ msgstr "%s: %ld standardgrænse og %ld standardtidsudløb\n"
 msgid "Can't set signal handler"
 msgstr "Kunne ikke sætte signalhåndteringen"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday (aflæsning af ur) mislykkedes"
 
@@ -10825,7 +10974,7 @@ msgstr "gettimeofday (aflæsning af ur) mislykkedes"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Kunne ikke udføre CYGETMON på %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10834,19 +10983,19 @@ msgstr ""
 "nu\n"
 
 # rec var tidligere flt
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f tal/sek; %f modtaget, %f sendt (tegn/sek)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 "%s: %lu heltal, %lu tegn; fifo: %lu grænse, %lu tidsudl, %lu maks, %lu nu\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f tal/sek; %f modtaget (tegn/sek)\n"
@@ -10938,130 +11087,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "kan ikke dæmonisere"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Brug: %s [tilvalg]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "kunne ikke fortolke %s %s"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "ukendt kolonne: %s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "kunne ikke fortolke %s %s"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "ukendt retning »%s«"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync mislykkedes"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "skrivning mislykkedes: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "kunne ikke fortolke %s %s"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "ingen kommando?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctl mislykkedes"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Brug: %s [tilvalg] <filnavn>\n"
-"\n"
-"Tilvalg:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -11073,7 +11199,7 @@ msgstr ""
 " -o, --offset <num>  forskydning af allokeringen, i byte\n"
 " -l, --length <num>  længde af allokeringen, i byte\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -11082,31 +11208,31 @@ msgstr ""
 "\n"
 "For yderligere information se fallocate(1).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "ingen længdeparameter angivet"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "ugyldig længdeværdi angivet"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "ugyldig forskydningsværdi angivet"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "intet filnavn angivet."
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr "uventet antal argumenter"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "behold størrelsestilstand (tilvalget -n) er ikke understøttet"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate mislykkedes"
@@ -11114,18 +11240,24 @@ msgstr "%s: fallocate mislykkedes"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "Brug:  %1$s [-sxun][-w #] fd#\n"
 "       %1$s [-sxon][-w #] fil [-c] kommando...\n"
@@ -11140,55 +11272,51 @@ msgstr ""
 "  -h  --help       Vis denne hjælpetekst\n"
 "  -V  --version    Vis version\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s: %s kræver præcis et kommandoparameter\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: kan ikke åbne låsefil %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: ugyldig værdi: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s: kræver filbeskrivelse, fil eller mappe\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: forgrening mislykkedes: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Brug: %s [tilvalg] <monteringspunkt>\n"
 "\n"
 "Tilvalg:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
+#, fuzzy
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 " -h, --help          denne hjælpetekst\n"
 " -f, --freeze        frys filsystemet\n"
 " -u, --unfreeze      fjern frysning af filsystemet\n"
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11196,36 +11324,35 @@ msgstr ""
 "\n"
 "For yderligere information se fsfreeze(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr "ingen handling angivet"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr "intet filnavn angivet"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat mislykkedes"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr "%s: er ikke en mappe"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr "%s: frysning mislykkedes"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s: fjernelse af frysning mislykkedes"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11234,8 +11361,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11243,99 +11370,88 @@ msgstr ""
 "\n"
 "For yderligere information se findmnt(1).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "kunne ikke fortolke %s %s"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "kunne ikke fortolke %s %s"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "kunne ikke læse timingfil %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "ingen handling angivet"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "%s: er ikke en mappe"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: skrivning mislykkedes"
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:84
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
-"\n"
-"Brug: %s [tilvalg]\n"
-"\n"
 
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <størrelse> opret delt hukommelsesegment med størrelsen <størrelse>\n"
 "  -S <nsems>     opret semaforinterval med <nsems> elementer\n"
 "  -Q             opret beskedkø\n"
 "  -p <tilstand>  tilladelse for ressourcen (standard er 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "For yderligere information se ipcmk(1).\n"
 "\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "oprettelse af delt hukommelse mislykkedes"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "Delt hukommelses-id: %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "oprettelse af beskedkø mislykkedes"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "Beskedkø-id=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "oprettelse af semafor mislykkedes"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "Semafor-id: %d\n"
@@ -11849,8 +11965,8 @@ msgstr ""
 "Delt hukommelsessegment dhsid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11859,8 +11975,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "tilstand=%#o\tadgangsrett=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "byte=%ld\tlpid=%d\tcpid=%d\tatlkbl=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11892,8 +12008,8 @@ msgstr ""
 "Msqid for beskedkø=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\ttilstand=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11925,8 +12041,8 @@ msgstr ""
 "Semafortabel semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11980,17 +12096,15 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "ugyldigt iflag: %s"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Brug: %s [ -dhV78neo12 ] [ -s <hastighed> ] [ -i [-]<iflag> ] <ldisk> "
 "<enhed>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11998,7 +12112,7 @@ msgstr ""
 "\n"
 "Kendte <ldisc>-navne:\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
@@ -12006,50 +12120,50 @@ msgstr ""
 "\n"
 "Kendte <iflag>-navne:\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "ugyldig hastighed: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach fra %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "ugyldigt tilvalg"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "ugyldig linjedisciplin: %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s er ikke en seriel linje"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan ikke indhente terminalattributter for %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "hastighed %d er ikke understøttet"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan ikke angive terminalattributter for %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "kan ikke angive linjedisciplin"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "kan ikke dæmonisere"
 
@@ -12205,15 +12319,14 @@ msgstr "%s mellemlager:"
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMA-knuder%d CPU'er:"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "Informationshjælp til CPU-arkitektur\n"
 "\n"
@@ -12221,26 +12334,22 @@ msgstr ""
 "  -p, --parse    udskriv fortolkningsformat frem for udskriftsformat.\n"
 "  -s, --sysroot  brug mappen som en ny systemrod (root).\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12249,12 +12358,12 @@ msgstr ""
 "\n"
 "For yderligere information se findmnt(1).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s: er ikke en mappe"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s er monteret.\t "
@@ -12289,47 +12398,45 @@ msgstr ""
 "\t -n                deaktiver automatisk bestemmelse af byterækkefølge\n"
 "\t -V                vis version og afslut\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: fejl ved skrivning til %s: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Antager omvendt byterækkefølge. Brug -n for at fremtvinge oprindelig "
 "byterækkefølge.\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Måletrin: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): forkert oversigtslinje\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kunne ikke finde \"_stext\" i %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profiladresse uden for området. Forkert map-fil?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12344,10 +12451,7 @@ msgstr ""
 "\n"
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12356,8 +12460,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12365,71 +12469,61 @@ msgstr ""
 "\n"
 "For yderligere information se namei(1).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice fra %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "ukendt kolonne: %s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "ugyldig værdi for tidsudløb: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "bruger"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Kunne ikke angive personlighed som %s"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Kunne ikke angive personlighed som %s"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: gammel prioritet %d, ny prioritet %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Brug: %s [tilvalg] <enhed>\n"
-"\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "brug: %s [tilvalg]\n"
 "    -d | --device <enhed>     vælg rtc-enhed (rtc0|rtc1|...)\n"
@@ -12442,8 +12536,8 @@ msgstr ""
 "    -v | --verbose            uddybende beskeder\n"
 "    -V | --version            vis version\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12451,167 +12545,167 @@ msgstr ""
 "\n"
 "For yderligere information se taskset(1).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "læs rtc-tid"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "læs systemtid"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "konverter rtc-tid"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "angiv rtc-alarm"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "aktiver rtc-alarm"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "angiv rtc wake-alarm"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "aktiver rtc-alarm"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "konverter rtc-tid"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "%s: ukendt hviletilstand »%s«\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "kunne ikke fortolke %s %s"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "kunne ikke fortolke pid"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: antager at RTC bruger UTC ...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Bruger UTC-tid.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Bruger lokal tid.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s: skal levere opvågningstid\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s er ikke aktiveret for opvågningshændelser\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarm %ld, sys_time %ld, rtc_time %ld, sekunder %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, fuzzy, c-format
 msgid "time doesn't go backward to %s"
 msgstr "%s: tiden går ikke baglæns til %s\n"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: opvågning fra »%s« der bruger %s på %s\n"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: opvågning fra »%s« der bruger %s på %s\n"
 
 # evt. "nej" -> "ingen"
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr "hviletilstand: nej; forlader\n"
 
 # evt. "slukket" -> "slået fra"
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr "hviletilstand: slukket; kører %s\n"
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "kunne ikke køre %s"
 
 # "slået til"
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr "hviletilstand: tændt; læser rtc\n"
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "read (læsning) mislykkedes: %s"
 
 # evt. "deaktiveret"
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr "hviletilstand: deaktiver; deaktiverer alarm\n"
 
 # evt. "deaktiveret"
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, fuzzy, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr "hviletilstand: deaktiver; deaktiverer alarm\n"
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr "hviletilstand: %s; sætter system i hvile\n"
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 #, fuzzy
 msgid "disable rtc alarm interrupt failed"
 msgstr "deaktiver rtc alarmafbrydelse"
@@ -12686,16 +12780,16 @@ msgstr ""
 "%s: %s\n"
 "Brug »%s --help« for yderligere detaljer.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: Ukendt arkitektur"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Ikke nok parametre"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Kunne ikke angive personlighed som %s"
@@ -12782,20 +12876,19 @@ msgstr "%s bruger IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s bruger overvågning (polling)\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "Brug: %s [tilvalg] <program> [parametre...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "Kør program med nogle navnerum udelt fra overprogram\n"
 "\n"
@@ -12805,8 +12898,7 @@ msgstr ""
 "  -i, --ipc         fjern deling af System V IPC-navnerum\n"
 "  -n, --net         fjern deling af netværksnavnerum\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12814,147 +12906,147 @@ msgstr ""
 "\n"
 "For yderligere information se unshare(1).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshare mislykkedes"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "kan ikke angive gruppe-id: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "kan ikke angive bruger-id: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: kunne ikke udføre %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s: kunne ikke udføre %s: %m"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: kunne ikke finde processen »%s«\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: kunne ikke udføre %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "kunne ikke allokere udmellemlager"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "ugyldig værdi for tidsudløb: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Ikke nok parametre"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "kunne ikke allokere udmellemlager"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "ugyldig hastighed: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "for mange forskellige hastigheder"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: kan ikke åbne som standard-ind: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ikke en tegnenhed"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: ikke åben for læsning/skrivning"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: dup-problem: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "type: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: læst: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: inddataoverløb"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12966,73 +13058,67 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "bruger"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "brugere"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Brug: %s [tilvalg]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "unshare mislykkedes"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "stat mislykkedes: %s"
 
 # Så vidt jeg kan se i koden, understøtter den kun y og n
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "er y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "er n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "oprettelse af semafor mislykkedes"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "ugyldigt iflag: %s"
@@ -13048,54 +13134,48 @@ msgstr ""
 "Brug »%s [tilvalg] %s«, hvis du virkelig vil bruge den.\n"
 "Skript blev ikke startet.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "kan ikke åbne timingfil %s"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skript påbegyndt, filen er %s\n"
 
 # %s er nok et tidspunkt.  Jeg ville fjerne "på" så det bliver
 # "påbegyndt 17:37" eller "påbegyndt 17-12-2010"
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Skript påbegyndt %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: kan ikke skrive skriptfil, fejl: %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -13104,79 +13184,76 @@ msgstr ""
 "\n"
 "Skript kørt %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skript færdigt, filen er %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty mislykkedes\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Løbet tør for pty-er\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <timingfil> [<typeskript> [<nævner>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "forventede et tal, men fik »%s«"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "nævner »%s«"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "skrivning til standard-ud mislykkedes"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "uventet linjeafslutning på %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "kunne ikke læse typeskriptfil %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "uventet antal argumenter"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "kan ikke åbne typeskriptfil %s"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "kunne ikke læse timingfil %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "timingfil %s: %lu: uventet format"
@@ -13187,50 +13264,47 @@ msgid "Argument error."
 msgstr "%s: Parameterfejl, brug\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13242,61 +13316,61 @@ msgstr ""
 # ifølge man-filen gør den "the screen" blank, det lader til at den
 # styrer strømsparetilstand så 'blank skærm' vil nok være rigtigt i 
 # den her og de omkringstående
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "kan ikke fremtvinge blank skærm\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "kan ikke tvinge ud af blank skærmtilstand\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "kan ikke indhente status for blank skærm\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "kan ikke ændre strømsparetilstand\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "kan ikke åbne enheden %s til skrivning\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl-fejl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Fejl ved skrivning af skærmkopi\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Kunne ikke læse %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM er ikke defineret.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: ukendt signal %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13324,144 +13398,149 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Brug: %s [tilvalg] enhed ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "ugyldigt tilvalg"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "ugyldig værdi for tidsudløb: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: kunne ikke åbne midlertidig fil.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "kan ikke angive bruger-id: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Kan ikke få diskstørrelsen"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Rundsendt meddelelse fra %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: kan ikke læse %s - brug standard-ind.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s: fstat mislykkedes"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "read (læsning) mislykkedes: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Brug: %s [tilvalg] stinavn [stinavn ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: kunne ikke finde din tty's navn\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: du har slået skriveadgang fra.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s er ikke logget ind på %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s har deaktiveret beskeder på %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s er ikke logget på\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s har deaktiveret beskeder\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s er logget på flere gange; skriver til %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "For lang inddatalinje.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Besked fra %s@%s (som %s) på %s klokken %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Besked fra %s@%s på %s klokken %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc mislykkedes"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Brug: %s [tilvalg]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13646,7 +13725,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13849,7 +13928,7 @@ msgstr ""
 "\n"
 "Mønster ikke fundet\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Mønster ikke fundet"
 
@@ -13915,7 +13994,7 @@ msgstr "hexdump: ugyldigt format {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: ugyldig konverteringstegn %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13967,89 +14046,89 @@ msgstr ""
 "Se pg(1) for yderligere information.\n"
 "-------------------------------------------------------\n"
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Brug: %s [-tal] [-p streng] [-cefnrs] [+linje] [+/mønster/] [filer]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: tilvalget kræver et parameter -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: ugyldigt tilvalg -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...hopper fremad\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...hopper bagud\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Ingen næste fil"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Ingen forrige fil"
 
 # kan filen %s bruges her?
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Læsefejl fra %s-fil\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Uventet filafslutning i %s-fil\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Ukendt fejl i %s-fil\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kunne ikke oprette midlertidig fil.\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE fejl: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(Filafslutning)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Ingen gammel søgestreng"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Kunne ikke åbne "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "gemte"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando ikke tilladt i rflag-tilstand.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() mislykkedes, prøv senere\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Næste fil: "
 
@@ -14121,8 +14200,8 @@ msgstr "Brug: %s [tilvalg] enhed ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -14138,39 +14217,205 @@ msgstr "kunne ikke fortolke pid"
 msgid "no input file specified"
 msgstr "intet filnavn angivet"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Brug: %s [tilvalg] enhed ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "problemer ved læsning af terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Ukendt undvigelsessekvens i inddata: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "For lang inddatalinje.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Brug:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Fejl ved lukning af fil\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Beklager. Du må ændre mærket (tag) på ikke-tomme partitioner.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Advarsel: partition %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Advarsel: partitionerne %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "og %s overlapper hinanden\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Brug: %s [tilvalg] enhed ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "enhed: noget lignende /dev/hda eller /dev/sda"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -s, --fstab            search in static table of filesystems\n"
+#~ " -m, --mtab             search in table of mounted filesystems\n"
+#~ " -k, --kernel           search in kernel table of mounted \n"
+#~ "                        filesystems (default)\n"
+#~ "\n"
+#~ " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
+#~ " -w, --timeout <num>    upper limit in millisecods which --poll will "
+#~ "block\n"
+#~ "\n"
+#~ " -c, --canonicalize     canonicalize printed paths\n"
+#~ " -d, --direction <word> search direction - 'forward' or 'backward'\n"
+#~ " -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+#~ " -f, --first-only       print the first found filesystem only\n"
+#~ " -h, --help             print this help\n"
+#~ " -i, --invert           invert sense of matching\n"
+#~ " -l, --list             use list format output\n"
+#~ " -n, --noheadings       don't print headings\n"
+#~ " -u, --notruncate       don't truncate text in columns\n"
+#~ " -O, --options <list>   limit the set of filesystems by mount options\n"
+#~ " -o, --output <list>    output columns\n"
+#~ " -P, --pairs            use key=\"value\" output format\n"
+#~ " -r, --raw              use raw output format\n"
+#~ " -a, --ascii            use ascii chars for tree formatting\n"
+#~ " -t, --types <list>     limit the set of filesystem by FS types\n"
+#~ " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
+#~ " -R, --submounts        print all submount for the matching filesystems\n"
+#~ " -S, --source <string>  device, LABEL= or UUID=device\n"
+#~ " -T, --target <string>  mountpoint\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Tilvalg:\n"
+#~ " -s, --fstab            søg i statisk tabel for filsystemer\n"
+#~ " -m, --mtab             søg i tabel over monterede filsystemer\n"
+#~ " -k, --kernel           søg i kernens tabel over monterede \n"
+#~ "                        filsystemer (standard)\n"
+#~ "\n"
+#~ " -c, --canonicalize     kanoniser udskrevne stier\n"
+#~ " -d, --direction <ord>  søgeretning - »fremad« eller »tilbage«\n"
+#~ " -e, --evaluate         vis alle MÆRKER (ETIKET/UUID), der er evalueret\n"
+#~ " -f, --first-only       vis kun det først fundne filsystem\n"
+#~ " -h, --help             vis denne hjælpetekst\n"
+#~ " -i, --invert           vend matchbetydningen om\n"
+#~ " -l, --list             brug listeformat for uddata\n"
+#~ " -n, --noheadings       vis ikke overskrifter\n"
+#~ " -u, --notruncate       afkort ikke tekst i kolonner\n"
+#~ " -O, --options <liste>  begræns filsystemer efter monteringstilvalg\n"
+#~ " -o, --output <liste>   uddatakolonner\n"
+#~ " -r, --raw              brug råt format for uddata\n"
+#~ " -a, --ascii            brug ascii-tegn til træformatering\n"
+#~ " -t, --types <liste>    begræns filsystemer efter FS-typer\n"
+#~ " -S, --source <streng>  enhed, ETIKET= eller UUID=enhed\n"
+#~ " -T, --target <streng>  monteringspunkt\n"
+#~ "\n"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd byte ["
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Brug:\n"
+#~ " %1$s -a [-e] [-v] [-f]             aktiver alle swap fra /etc/fstab\n"
+#~ " %1$s [-p priority] [-v] [-f] <speciel>  aktiver angivet swap\n"
+#~ " %1$s -s                            vis forbrugsreferat for swap\n"
+#~ " %1$s -h                            vis hjælp\n"
+#~ " %1$s -V                            vis version\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Brug:\n"
+#~ " %1$s -a [-v]                      deaktiver alle swap\n"
+#~ " %1$s [-v] <speciel>               deaktiver angivet swap\n"
+#~ " %1$s -h                           vis hjælp\n"
+#~ " %1$s -V                           vis version\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Brug: %s [tilvalg] <filnavn>\n"
+#~ "\n"
+#~ "Tilvalg:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Brug: %s [tilvalg]\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Brug: %s [tilvalg] <enhed>\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Brug: %s [tilvalg] enhed ...\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14323,28 +14568,10 @@ msgstr "For lang inddatalinje.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [eller --help]:      vis denne besked"
 
-#~ msgid "dangerous options:"
-#~ msgstr "farlige tilvalg:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g [eller --show-geometry]: vis kernens bud på den geometri"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [eller --show-geometry]: vis kernens bud på den geometri ud fra\n"
-#~ "                                partitionstabellen"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [eller --show-extended]: medtag udvidede partitioner i uddata\n"
-#~ "                                eller forvent beskrivelser for dem i "
-#~ "inddata"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr "    -L  [eller --Linux]:      giv ikke råd, der ikke vedrører Linux"
@@ -14400,54 +14627,9 @@ msgstr "For lang inddatalinje.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [tilvalg] [--] tilvalgsstreng parametre\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [tilvalg] -o|--options tilvalgsstreng [tilvalg] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              parametre\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr "  -a, --alternative            Tillad lange tilvalg med enkelt -\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Denne lille manual\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr ""
-#~ "  -l, --longoptions=langtilvalg  Lange tilvalg, der skal genkendes\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=prognavn          Navnet som fejl skal rapporteres under\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=tilvalgsstreng Korte tilvalg, der skal genkendes\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Undertryk fejlrapportering fra getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Ingen normale uddata\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=skal             Angiv konventioner for anførselstegn\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Tjek versionen af getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr ""
-#~ "  -u, --unqote                 Indskyd ikke anførselstegn i uddata\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Vis versionsinformation\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (udvidet) 1.1.4\n"
 
diff --git a/po/de.po b/po/de.po
index 664a46d33..e57ea6253 100644
--- a/po/de.po
+++ b/po/de.po
@@ -43,8 +43,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2008-01-09 17:38+0200\n"
 "Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n"
 "Language-Team: German <translation-team-de@lists.sourceforge.net>\n"
@@ -143,29 +143,29 @@ msgstr "Partitionstabelle erneut lesen"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "Größe in Bytes ermitteln"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "es ist nicht möglich, %s zu öffnen"
@@ -244,7 +244,7 @@ msgid "Verifying ... "
 msgstr "Überprüfen … "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Konnte „%s“ nicht öffnen"
@@ -288,15 +288,15 @@ msgstr ""
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -309,7 +309,7 @@ msgstr "%s von %s\n"
 msgid "cannot stat file %s"
 msgstr "kann nicht auf Gerät %s zugreifen"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -358,8 +358,8 @@ msgid "stat failed: %s"
 msgstr "(Nächste Datei: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "„openpty“ ist fehlgeschlagen\n"
@@ -590,55 +590,55 @@ msgstr "%s: ungültiges cramfs – ungültiges Dateidatenoffset\n"
 msgid "compiled without -x support"
 msgstr "%s: Die Unterstützung für -x wurde nicht mit übersetzt\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Aufruf: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s ist eingehängt.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Möchten Sie wirklich fortfahren"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "Überprüfung abgebrochen. \n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zonennummer < FIRSTZONE in Datei „%s“."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zonennummer >= ZONES in Datei „%s“."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Block entfernen"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Lesefehler: kann nicht zu Block springen in Datei „%s“\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Fehler beim Lesen: beschädigter Block in Datei „%s“\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -647,298 +647,298 @@ msgstr ""
 "Interner Fehler: beim Versuch einen beschädigten Block zu schreiben\n"
 "Schreibanweisung übergangen\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "„seek“ fehlgeschlagen in write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Fehler beim Schreiben: beschädigter Block in Datei „%s“\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "„seek“ failed in write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "Konnte den Superblock nicht schreiben"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Konnte die „inode map“ nicht schreiben"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Konnte die „zone map“ nicht schreiben"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Konnte die „inodes“ nicht schreiben"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "„seek“ gescheitert."
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "kann Puffer für Tabellen nicht reservieren"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "Konnte den Superblock nicht lesen"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "Ungültige „magic number“ im Superblock"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Es werden nur Blöcke/Zonen von 1k Größe unterstützt"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Ungültiger Wert im Feld „s_imap_block“ im Superblock"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Ungültiger Wert im Feld „s_zmap_block“ im Superblock"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Kein Speicherplatz für „inode map“ verfügbar"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "Kein Speicherplatz für „inode map“ verfügbar"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Kein Speicherplatz für „inodes“ verfügbar"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Kein Speicherplatz für „inode count“ verfügbar"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Kein Speicherplatz für „zone count“ verfügbar"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Kann „inode map“ nicht lesen"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Kann „zone map“ nicht lesen"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Kann „inodes“ nicht lesen."
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Warnung: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld Blöcke\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonesize=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxsize=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Filesystem state=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "namelen=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "Inode %d ist als unbenutzt gekennzeichnet, aber Datei „%s“ benutzt sie\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Inode als benutzt kennzeichnen"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Die Datei „%s“ hat Mode %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Warnung: „inode count“ zu groß.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "„root inode“ ist kein Verzeichnis"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Block wurde zuvor benutzt. Nun in Datei „%s“."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Zurücksetzen"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Block %d in Datei „%s“ ist als unbenutzt markiert."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Korrigieren"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "Das Verzeichnis „%s“ enthält eine ungültige Inode-Nummer für Datei „%.*s“."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Entfernen"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: ungültiges Verzeichnis: „.“ kommt nicht zuerst\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: ungültiges Verzeichnis: „..“ kommt nicht als zweites\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "interner Fehler"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: ungültiges Verzeichnis: Größe < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "seek in bad_zone fehlgeschlagen"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Inode %d Modus nicht zurückgesetzt."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inode %d nicht benutzt, in Bitmap als benutzt markiert."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inode %d benutzt, in Bitmap als unbenutzt markiert."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Setzen"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (Modus = %07o), i_nlinks=%d, gezählt=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Setze i_nlinks auf count"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zone %d: als benutzt markiert, keine Datei benutzt sie."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Mark. entf."
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zone %d: in Benutzung, gezählt=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zone %d: nicht in Benutzung, gezählt=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "ungültige INode-Größe"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "ungültige V2-INode-Größe"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "Brauche Terminal für interaktive Reparaturen."
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "Konnte „%s“ nicht öffnen"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s ist in Ordnung, keine Überprüfung.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Überprüfung des Dateisystem auf %s erzwungen.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Dateisystem auf %s ist gestört (dirty), Überprüfung erforderlich.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -947,12 +947,12 @@ msgstr ""
 "\n"
 "%6ld INodes benutzten (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones benutzten (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -975,7 +975,7 @@ msgstr ""
 "------\n"
 "%6d Dateien\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1099,7 +1099,7 @@ msgstr "zu viele Inodes – Maximum ist 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "nicht genügend Platz; es werden wenigstens %lu Blöcke benötigt"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gerät: %s\n"
@@ -1269,10 +1269,8 @@ msgstr "%6.2f%% (%+d Bytes)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Fehler beim Schließen von Datei\n"
+msgid "cannot close file %s"
+msgstr "Konnte „%s“ nicht öffnen"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1385,88 +1383,98 @@ msgstr ""
 "WARNUNG: Gerätenummern abgeschnitten auf %u Bits. Das bedeutet beinahe mit\n"
 "Sicherheit, dass einige Gerätedateien falsch sind.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Aufruf: %s [-c | -l Datei] [-nXX] [-iXX] /dev/Name [Blöcke]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s ist eingehängt; es wird hier kein Dateisystem angelegt!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "Seek auf Bootblock fehlgeschlagen in write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "kann Bootsektor nicht löschen"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "Seek fehlgeschlagen in write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "Konnte den Superblock nicht schreiben"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "kann Inode-Tabellen nicht schreiben"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "kann Zonentabelle nicht schreiben"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "kann Inodes nicht schreiben"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "„seek“ fehlgeschlagen in write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "Schreiben fehlgeschlagen in write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "zu viele beschädigte Blöcke"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "nicht genügend gute Blöcke"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "kann Puffer für Tabellen nicht reservieren"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "kann Puffer für Tabellen nicht reservieren"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "kann Puffer für Inodes nicht reservieren"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodes\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld Blöcke\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1475,73 +1483,73 @@ msgstr ""
 "Maxgröße=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "Seek fehlgeschlagen während Blocküberprüfung"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Merkwürdige Werte in do_check: wahrscheinlich Fehler\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "Seek fehlgeschlagen in check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "beschädigte Blöcke vor dem Datenbereich: kann kein Dateisystem herstellen"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d beschädigte Blöcke\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "ein beschädigter Block\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "kann Datei mit beschädigten Blöcken nicht öffnen"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "Konnte nicht von der Festplatte lesen"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "ungültige INode-Größe"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol-Fehler: Anzahl der Blöcke nicht angegeben"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "„seek“ gescheitert."
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
@@ -1550,27 +1558,27 @@ msgstr "„openpty“ ist fehlgeschlagen\n"
 # libc.po:
 # "Device or resource busy"
 # "Das Gerät oder die Ressource ist belegt"
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "Es wird nicht versucht, ein Dateisystem auf „%s“ zu erzeugen"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Anzahl der Sektoren"
@@ -1911,7 +1919,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "Seek fehlgeschlagen in write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2266,7 +2274,7 @@ msgid "   Logical"
 msgstr "  Logische"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -2951,12 +2959,12 @@ msgstr "„BSD disklabel“ Befehl (m für Hilfe): "
 
 # %s can be "Sektor" or "Zylinder".
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Erster %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Letzter %s oder +Größe, +GrößeK oder +GrößeM"
@@ -3103,7 +3111,7 @@ msgid "tracks/cylinder"
 msgstr "Spuren/Zylinder"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "Zylinder"
 
@@ -3170,12 +3178,12 @@ msgstr "Die maximale Anzahl von Partitionen wurde erzeugt\n"
 msgid "This partition already exists.\n"
 msgstr "Diese Partition existiert bereits.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Warnung: zu viele Partitionen (%d, Maximum ist %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3383,7 +3391,7 @@ msgstr "Sie müssen angeben"
 msgid "heads"
 msgstr "Köpfe"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "Sektoren"
 
@@ -3820,7 +3828,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s  boot.     Anfang        Ende     Blöcke   Id  System\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Gerät"
 
@@ -3907,7 +3915,7 @@ msgstr "Gesamtanzahl belegter Sektoren %ld größer als Maximum %lld\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld unbenutzte Sektoren\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partition %d ist schon festgelegt.  Vor Wiederanlegen bitte löschen.\n"
@@ -4064,38 +4072,38 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Synchronisiere Platten.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d hat keinen Datenbereich\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Neuer Datenanfang"
 
 # That sounds pretty ummm…
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Expertenkommando (m für Hilfe): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Anzahl der Zylinder"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Anzahl der Köpfe"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Anzahl der Sektoren"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Warnung: setze Sektoren-Offset für DOS-Kompatibilität\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4104,32 +4112,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Festplatte %s enthält keine gültige Partitionstabelle\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: Unbekannter Befehl\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Dieser Kernel stellt Sektorengröße selbst fest – Option -b ignoriert\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4138,16 +4146,16 @@ msgstr ""
 "Warnung: Option -b (Sektorengröße setzen) sollte nur mit einem\n"
 "angegebenen Gerät benutzt werden\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Ein ODF/1-Disklabel auf %s entdeckt, gehe in Disklabel-Modus.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Befehl (m für Hilfe): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4156,16 +4164,16 @@ msgstr ""
 "\n"
 "Momentane Bootdatei ist: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Bitte geben Sie den Namen der neuen Boot-Datei an: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-Datei unverändert\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4488,9 +4496,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tSie haben einen unüblichen Boot-Dateinamen gewählt.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Tut mir leid, Sie können das Tag nicht-leerer Partitionen ändern.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Sie müssen root sein, um die Systemuhr zu ändern.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4509,7 +4517,7 @@ msgstr ""
 "Geben Sie JAWOHL ein, wenn Sie sicher sind, diese\n"
 "Partition von anderem Typ sein lassen zu wollen.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "JAWOHL\n"
 
@@ -4717,7 +4725,7 @@ msgstr "Unbenutzter Bereich – Sektor 0–%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Unbenutzter Bereich – Sektor %d–%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4726,7 +4734,7 @@ msgstr ""
 "Andere Partition überdecken bereits die ganze Platte.\n"
 "Löschen/verkleinern Sie sie vor einem erneuten Versuch.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4735,12 +4743,12 @@ msgstr ""
 "Es ist höchst empfehlenswert, die elfte Partition die ganze\n"
 "Platte überdecken und sie vom Typ „SGI volume“ sein zu lassen.\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4751,7 +4759,7 @@ msgstr ""
 "Ihr Wert %d %s überdeckt einige andere Partitionen. Ihr Eintrag wurde auf\n"
 "%d %s geändert\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4762,7 +4770,7 @@ msgstr ""
 "dem\n"
 "Beginn bei 0 und %u Sektoren.\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4776,7 +4784,7 @@ msgstr ""
 "Geben Sie JAWOHL ein, wenn Sie sich ganz sicher sind, dass Sie diese\n"
 "Partition als 82 (Linux Swap) markieren möchten: "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4796,7 +4804,7 @@ msgstr ""
 "Einheiten = %s of %d × 512 Byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4809,28 +4817,28 @@ msgstr ""
 "Einheiten: %s mit %d × 512 Byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Start       Ende   Blöcke   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Anzahl der alternierenden Zylinder"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Extra-Sektoren pro Zylinder"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Interleave-Faktor"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Rotationsgeschwindigkeit (U/min)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Anzahl der physikalischen Zylinder"
 
@@ -5294,7 +5302,7 @@ msgstr "Festplatte %s: Die Geometrie konnte nicht festgestellt werden\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Festplatte %s: Kann Größe nicht ermitteln\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5305,22 +5313,22 @@ msgstr ""
 "ganzen Platte. Die Benutzung von fdisk darauf is vermutlich sinnlos.\n"
 "[Benutzen Sie die Option --force, wenn Sie das wirklich wollen.]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Warnung: HDIO_GETGEO ergibt, dass es %lu Köpfe gibt\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Warnung: HDIO_GETGEO ergibt, dass es %lu Sektoren gibt\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Warnung: BLKGETSIZE/HDIO_GETGEO ergibt, dass es %lu Zylinder gibt\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5332,7 +5340,7 @@ msgstr ""
 "Adressierungsschema\n"
 "verwendet.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5341,14 +5349,14 @@ msgstr ""
 "\n"
 "Festplatte %s: %lu Zylinder, %lu Köpfe, %lu Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s von Partition %s hat unmöglichen Wert für Kopf: %lu (sollte 0–%lu sein)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5357,7 +5365,7 @@ msgstr ""
 "%s von Partition %s hat unmöglichen Wert für Sektor: %lu (sollte 1–%lu "
 "sein)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5366,7 +5374,7 @@ msgstr ""
 "%s von Partition %s hat unmöglichen Wert für Zylinder: %lu (sollte 0–%lu "
 "sein)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5375,12 +5383,12 @@ msgstr ""
 "Id  Name\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Die Partitionstabelle wird erneut gelesen…\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5390,26 +5398,26 @@ msgstr ""
 "Der Befehl zum Neueinlesen der Partitionstabelle schlug fehl.\n"
 "Starten Sie Ihr System jetzt neu, bevor Sie mkfs verwenden.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fehler beim Schließen von %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: es gibt keine derartige Partition\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "nicht erkanntes Format – benutze Sektoren\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "nicht implementiertes Format – benutze %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5419,12 +5427,12 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang   Ende  #Zyl.    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5433,12 +5441,12 @@ msgstr ""
 "Einheit = Sektoren von 512 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Gerät  boot.   Anfang      Ende  #Sektoren Id  System\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5447,12 +5455,12 @@ msgstr ""
 "Einheit = Blöcke von 1024 Bytes, Zählung beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Gerät  boot.  Anfang      Ende   #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5462,31 +5470,31 @@ msgstr ""
 "beginnt bei %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Gerät  boot. Anfang Ende   MiB    #Blöcke   Id  System\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tAnfang: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tEnde: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partition endet auf Zylinder %ld, hinter dem Ende der Festplatte\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Keine Partitionen gefunden\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5497,53 +5505,41 @@ msgstr ""
 "  für C/H/S=*/%ld/%ld (anstelle von %ld/%ld/%ld).\n"
 "Für diese Auflistung nehme ich diese Geometrie an.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "Es gibt keine Partitionstabelle.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Merkwürdig, es sind nur %d Partitionen definiert.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Warnung: Partition %s hat Größe 0, ist aber nicht als leer markiert\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Warnung: Partition %s hat Größe 0 und ist bootfähig\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Warnung: Partition %s hat Größe 0 und beginnt nicht bei Null\n"
 
-# XXX – Merge with next strings.
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Warnung: Partition %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "is nicht enthalten in Partition %s\n"
 
-# XXX – Merge with next strings.
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Warnung: Partitionen %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "and %s überlappen sich\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Warnung: Partition %d ist leer\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5552,17 +5548,17 @@ msgstr ""
 "Warnung: Partition %s enthält einen Teil der Partitionstabelle\n"
 "(Sektor %lu) und wird diese zerstören, wenn sie gefüllt wird.\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Warnung: Partition %s fängt bei Sektor 0 an\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Warnung: Partition %s reicht über das Ende der Platte hinaus\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5570,17 +5566,17 @@ msgstr ""
 "Unter den primären Partitionen kann höchstens eine erweiterte sein.\n"
 " (Auch wenn das unter Linux kein Problem ist.)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Warnung: Partition %s beginnt nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Warnung: Partition %s endet nicht an einer Zylindergrenze\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5590,7 +5586,7 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird diese\n"
 "         Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5598,7 +5594,7 @@ msgstr ""
 "Warnung: Normalerweise kann man nur von primäre Partitionen booten.\n"
 "LILO ignoriert die „bootfähig“-Einstellung komplett.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5607,33 +5603,33 @@ msgstr ""
 "         Dies spielt bei LILO keine Rolle, aber der DOS-MBR wird auf\n"
 "         dieser Festplatte nicht booten.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "Anfang"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Anfang: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "Ende"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partition %s: Ende: (c,h,s) erwartet (%ld,%ld,%ld) gefunden (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partition %s endet am Zylinder %ld, hinter dem Ende der Platte\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5642,7 +5638,7 @@ msgstr ""
 "Warnung: Anfang der erweiterten Partition von %ld auf %ld verschoben.\n"
 "(Nur zum Zwecke der Auflistung. Nicht den Inhalt ändern.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5650,132 +5646,132 @@ msgstr ""
 "Warnung: erweiterte Partition beginnt nicht an einer Zylindergrenze\n"
 "DOS und Linux werden den Inhalt unterschiedlich interpretieren.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "Zu viele Partitionen - ignoriere alle hinter Nr. (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "Partitionsbaum?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager erkannt – kann das nicht handhaben\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-Signatur gefunden – gebe auf\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "merkwürdig… eine erweiterte Partition der Größe 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "merkwürdig… eine BSD-Partition der Größe 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: nicht erkannte Partitiontabellentyp\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Die Option „-n“ wurde verwendet: Es wurde nichts verändert\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Speichern der alten Sektoren fehlgeschlagen – Abbruch\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Schreiben der Partition auf %s fehlgeschlagen\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "Lange oder unvollständige Eingabezeilen – beende\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Eingabefehler: „=“ erwartet nach %s-Feld\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Eingabefehler: unerwartetes Zeichen %c nach %s-Feld\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nicht erkannte Eingabe: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "Zahl zu groß\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "abschließender Müll hinter Zahl\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "kein Platz für Partitionsdeskriptor\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "kann umgebende erweiterte Partition nicht anlegen\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "zu viele Eingabefelder\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Für mehr kein Platz\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Illegaler Typ\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Warnung: gegebene Größe (%lu) überschreitet maximal erlaubte Größe (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Warnung: leere Partition\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Warnung: ungültiger Partitionsanfang (kleinstmöglich %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nicht erkanntes Boofähig-Flag – wählen Sie - oder *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "partielle c,h,s-Spezifikation?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Erweiterte Partition nicht dort, wo erwartet\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "ungültige Eingabe\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "Zu viele Partitionen\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5786,99 +5782,182 @@ msgstr ""
 "Normalerweise brauchen Sie nur <anfang> und <größe> anzugeben (und\n"
 "vielleicht <typ>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Aufruf: %s [Optionen] gerät …\n"
+msgstr "Aufruf:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "gerät: etwas wie /dev/hda oder /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d Partitionen:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "gefährliche Optionen:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [oder --show-pt-geometry]: aus der Partitionstabelle geratene "
+"Geometrie\n"
+"                                    ausgeben"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [oder --show-extended]: auch die erweiterten Partitionen mit "
+"auflisten\n"
+"                               bzw. bei Eingabe Deskriptoren für sie erwarten"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Aufruf:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s Gerät\t\t aktive Partitionen auf Gerät auflisten\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s Gerät n1 n2 … aktive Partitionen n1 …, der Rest deaktivieren\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An Gerät\t aktiviere Partition n, device die anderen\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5887,64 +5966,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 "Benutzen Sie die Optioen --force, um diese Überprüfung zu unterbinden.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "kein Befehl?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "zusammen: %llu Blöcke\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Aufruf: sfdisk --print-id Gerät Partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Aufruf: sfdisk --change-id Gerät Partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Aufruf: sfdisk --id Gerät Partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "Man kann nur ein Gerät angeben (außer mit -l oder -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "Konnte %s nicht zum Lesen/Schreiben öffnen\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "Konnte %s nicht zum Lesen öffnen\n"
 
 # And again one for show_geometry()…
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld Zylinder, %ld Köpfe, %ld Sektoren/Spur\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kann die Größe von %s nicht feststellen\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "ungültiges Aktiv-Byte: 0x%x anstelle von 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5952,7 +6031,7 @@ msgstr ""
 "Fertig\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5961,36 +6040,36 @@ msgstr ""
 "Sie haben %d aktive primäre Partitionen.  Dies spielt bei LILO keine Rolle,\n"
 "aber der DOS-MBR bootet nur Festplatten mit einer aktiven Partition.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "Partition %s hat ID %x und ist nicht versteckt\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ungültige ID %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Diese Platte ist momentan in Benutzung.\n"
 
 # This is a stat()
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Schwerwiegender Fehler: kann %s nicht finden\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Warnung: %s ist kein blockorientiertes Gerät\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Überprüfe, dass niemand diese Festplatte zur Zeit benutzt …\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -6004,31 +6083,31 @@ msgstr ""
 "deaktivieren Sie alle Swap-Partitionen (mit swapoff).\n"
 "Benutzen Sie --no-reread, um diese Überprüfung zu unterbinden.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 "Benutzen Sie die Optioen --force, um alle Überprüfungen zu unterbinden.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Alte Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d existiert nicht, kann sie nicht ändern\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Neue Aufteilung:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -6036,21 +6115,21 @@ msgstr ""
 "Mir gefallen diese Partitionen nicht – nichts geändert.\n"
 "(Wenn Sie das wirklich wollen, benutzen Sie die Option --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Mir gefällt das nicht – Sie sollten am besten mit „Nein“ antworten\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Sind Sie damit zufrieden? [y – ja, n – nein, q – aufhören] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wollen Sie das auf Platte schreiben? [y – ja, n – nein, q – aufhören] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -6059,16 +6138,16 @@ msgstr ""
 "\n"
 "sfdisk: vorzeitiges Ende der Eingabe\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Höre auf – nichts geändert\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Bitte antworten Sie mit y, n oder q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6077,7 +6156,7 @@ msgstr ""
 "Die neue Partitionstabelle wurde erfolgreich geschrieben\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6108,101 +6187,103 @@ msgstr "Synchronisiere Platten.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s erfolgreich beendet.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "„seek“ gescheitert."
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: Konnte %s nicht öffnen: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: Nicht gefunden"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: Fehler %d beim Entpacken! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s ist kein lp-Gerät.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Überprüfung des Dateisystem auf %s erzwungen.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6210,58 +6291,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s ist kein lp-Gerät.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s ausgehängt\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Aushängen aller restlichen Dateisysteme…"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Aushängen aller restlichen Dateisysteme…"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: Unbekanntes Argument: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6280,33 +6361,81 @@ msgstr "leere lange Option nach -l oder --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "Unbekannte Shell als Argument von -s oder --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
 msgstr ""
+"        getopt [Optionen] -o|--options Optionszeichenkette [Optionen] [--]\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative          lange Optionen dürfen auch mit einfachem - "
+"beginnen\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                 dieser kleine Hilfe\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=lopt     zu erkennende lange Optionen\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=progname        der Name, der in Fehlermeldungen benutzt wird\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=OptZKette    zu erkennende kurze Optionen\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                Fehlermeldungen von getopt(3) unterdrücken\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output         keine normale Ausgabe\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=Shell          Konventionen für Shell-Quoting setzen\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                 auf getopt(1)-Version testen\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unquote              die Ausgabe nicht quoten\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version              Versionsinformation ausgeben\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "fehlendes Optionszeichenkettenargument"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "Interner Fehler, kontaktieren Sie den Autor."
 
@@ -6820,70 +6949,88 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kann den Epochenwert im Kernel nicht ändern.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d Partitionen:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6891,22 +7038,22 @@ msgstr ""
 "                  (siehe hwclock(8))\n"
 
 # "stellen"
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "Konnte die Systemuhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s nimmt keine Nicht-Options-Argumente. Sie gaben %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6915,7 +7062,7 @@ msgstr ""
 "Sie haben mehrere Funktionen angefordert.\n"
 "Sie können immer nur eine Funktion gleichzeitig ausführen.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6924,7 +7071,7 @@ msgstr ""
 "%s: Die Optionen --utc und --localtime schließen sich aus. Sie gaben beide "
 "an.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6933,7 +7080,7 @@ msgstr ""
 "%s: Die Optionen --adjust und --noadjfile schließen sich aus. Sie gaben "
 "beide an.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6942,41 +7089,41 @@ msgstr ""
 "%s: Die Optionen --adjust und --noadjfile schließen sich aus. Sie gaben "
 "beide an.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: Ohne --noadjfile müssen Sie entweder --utc oder --localtime angeben.\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Keine brauchbare Zeitangabe. Kann Uhr nicht stellen.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Sie müssen root sein, um die Hardwareuhr zu ändern.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Sie müssen root sein, um die Systemuhr zu ändern.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr "Sie müssen root sein, um den „epoch“-Wert zu ändern.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "Es wurde keine Zugriffsart gefunden, mit der auf die Hardwareuhr zugegriffen "
 "werden konnte.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7159,7 +7306,7 @@ msgid "failed to read mtab"
 msgstr "kann kein „stat“ auf %s anwenden"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
@@ -7201,45 +7348,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7248,27 +7435,27 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: Einhängen ist fehlgeschlagen"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
@@ -7359,7 +7546,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: PAM-Fehlschlag, breche ab: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Passwort: "
 
@@ -7813,51 +8000,52 @@ msgstr "EXZESSIV viele Zeilenvorschübe"
 msgid "too many bare linefeeds."
 msgstr "zu viele nackte Zeilenvorschübe\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Login nach %d Sekunden abgebrochen\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Letzte Anmeldung: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "von %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "auf %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "Konnte %s nicht öffnen"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
 # Das geht ins Syslog – ich übersetze es nicht. (MPi)
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -7888,7 +8076,7 @@ msgstr "mount: keine Berechtigung"
 msgid "setuid failed"
 msgstr "setuid() fehlgeschlagen"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "„exec“ fehlgeschlagen\n"
@@ -7933,8 +8121,8 @@ msgstr "%s: Konnte Kontext für %s nicht setzen"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: kann %s nicht entsperren: %s (Ihre Änderungen sind noch in %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "„fork“ fehlgeschlagen\n"
@@ -7989,24 +8177,21 @@ msgstr "illegaler Wert für Jahr: benutzen Sie 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Aufruf: cal [-13smjyV] [[Monat] Jahr]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -8119,32 +8304,32 @@ msgstr " Entfernen"
 msgid "failed to add line to output"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "Seek-Fehler"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: Konnte %s nicht lesen.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "„malloc“ schlug fehl"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8155,49 +8340,74 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Verfügbare Befehle:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8206,42 +8416,42 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
@@ -8266,12 +8476,12 @@ msgstr "%s: Konnte den Prozess „%s“ nicht finden.\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: Unbekanntes Signal %s; gültige Signale:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Aufruf: %s [ -s Signal | -p ] [ -a ] PID …\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "        %s -l [ Signal ]\n"
@@ -8291,84 +8501,83 @@ msgstr "Blockgröße: %d\n"
 msgid "connect %s"
 msgstr "NFS-Verbindung"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "NFS-Socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "NFS-Verbindung"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Nächste Datei: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Der Wert „%s“ für „%s“ ist außerhalb des Bereiches\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: Unbekannter „Facility“-Name: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: Unbekannter Prioritätsname: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8506,7 +8715,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8524,12 +8733,13 @@ msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8537,7 +8747,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8560,7 +8770,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8569,33 +8779,33 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%d Bytes aus %s gelesen\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "„exec“ fehlgeschlagen\n"
@@ -8615,24 +8825,12 @@ msgstr "kann nicht auf Gerät %s zugreifen"
 msgid "%s - No such file or directory\n"
 msgstr "„root inode“ ist kein Verzeichnis"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "Aufruf: namei [-mx] Dateiname [Dateiname …]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d Partitionen:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8644,8 +8842,8 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, fuzzy, c-format
+#: misc-utils/namei.c:425
+#, fuzzy
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8653,12 +8851,12 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date-Argument zu lang\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8668,169 +8866,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: Konnte %s nicht in %s umbenennen: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: Ungültiges Argument %s für die Option „-l“.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Schreib."
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "read %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "kann kein „stat“ auf %s anwenden"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Konnte %s nicht öffnen: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Konnte %s nicht öffnen: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Fehler beim Lesen von %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "ungültige ID"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "ungültige ID"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: Ungültiger Wert\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8838,29 +9034,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8896,32 +9091,33 @@ msgid "%s: write failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "Bytes"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8930,11 +9126,11 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -9036,65 +9232,65 @@ msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "Konnte %s nicht in %s umbenennen: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: Nutzer „%s“ existiert nicht.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", Offset %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", Größenbeschränkung %lld"
 
 # Verschlüsselungstyp
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", Verschlüsselungsmethode %s (Typ %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", Offset %d"
 
 # Verschlüsselungstyp
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", Verschlüsselungstyp %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: Konnte keine Informationen über das Gerät %s erhalten: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: Keine Zugriffsrechte, um auf /dev/loop# zu schauen"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: Konnte kein freies „loop“-Gerät finden"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -9104,60 +9300,58 @@ msgstr ""
 "       kein „loop“-Gerät? (Wenn dies der Fall ist, dann sollten Sie den\n"
 "       Kernel neu kompilieren oder „modprobe loop“ ausführen.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Speicher ist alle beim Vergrößern eines Puffers.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d wird bereits benutzt\n"
 
 # That sounds somehow dumb.
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s ist schreibgeschützt, wird eingehängt im Nur-Lese-Modus"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Konnte kein Lock im Speicher bekommen, beende.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): Erfolg\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): Erfolg\n"
 
 # this is actually an open()…
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: Konnte das Gerät %s nicht löschen: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Dieses mount wurde ohne Loop-Unterstützung übersetzt. Bitte neu übersetzen.\n"
 
 # Setup
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9165,7 +9359,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "Aufruf:\n"
 "  Informationen anzeigen:\n"
@@ -9177,38 +9371,35 @@ msgstr ""
 "  Setup:\n"
 "    %s [ -e Verschlüsselung ] [ -o Offset ] {-f|loop-Gerät} Datei\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: Konnte das Gerät %s nicht öffnen: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
@@ -9217,12 +9408,12 @@ msgstr "mount: loop=%s gestohlen …versuche es erneut\n"
 # libc.po:
 # "Device or resource busy"
 # "Das Gerät oder die Ressource ist belegt"
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: Das Gerät wird momentan noch benutzt"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9806,167 +9997,170 @@ msgstr "Fehler im Aufruf von xstrndup"
 msgid "not enough memory"
 msgstr "Nicht genügend Speicher"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: unerwartetes Dateiende in %s-Datei\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "„exec“ fehlgeschlagen\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() fehlgeschlagen"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Name"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 "%s: Warnung: %s hat unsichere Zugriffsrechte %04o, %04o wird empfohlen\n"
 
 # holes
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: Überspringe die Datei %s – sie scheint Löcher zu enthalten.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
 # The first %s is swapon/swapoff
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s für %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: Konnte das Gerät für %s nicht finden\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "Nicht Superuser.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "„seek“ gescheitert."
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10242,7 +10436,7 @@ msgstr "Partition %d ausgewählt\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10303,19 +10497,13 @@ msgstr "   p   Die BSD-Partitionstabelle anzeigen"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Festplatte %s enthält keine gültige Partitionstabelle\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10326,21 +10514,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Verfügbare Befehle:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10349,26 +10536,26 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
@@ -10496,7 +10683,7 @@ msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 msgid "failed to set pid %d's policy"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() konnte Zeit nicht von %s lesen."
@@ -10768,7 +10955,7 @@ msgstr "%s: %ld voreingestellte Schwelle und %ld voreingestellte Auszeit\n"
 msgid "Can't set signal handler"
 msgstr "Kann Signalhandler nicht ermitteln"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "„gettimeofday“ fehlgeschlagen"
 
@@ -10777,26 +10964,26 @@ msgstr "„gettimeofday“ fehlgeschlagen"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Kann kein CYGETMON auf %s auslösen: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f int/sec; %f rec, %f send (char/sec)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (char/sec)\n"
@@ -10889,124 +11076,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Aufruf: %s [Optionen] gerät …\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Unbekannter Befehl: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Konnte nicht in das Verzeichnis %s wechseln!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Nächste Datei: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "kein Befehl?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "Aufruf von „fsync“ fehlgeschlagen"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -11014,7 +11184,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11023,36 +11193,36 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Nicht genug Argumente"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Ungültiger Wert zu setzen: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "Maximale Anzahl der Segmente = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
@@ -11060,63 +11230,64 @@ msgstr "„openpty“ ist fehlgeschlagen\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s erwartet ein Argument\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: Konnte %s nicht öffnen: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: Ungültiger Wert\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "„fork“ fehlgeschlagen\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11124,38 +11295,37 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "„seek“ gescheitert."
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "„root inode“ ist kein Verzeichnis"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11164,8 +11334,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11173,96 +11343,87 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() konnte Zeit nicht von %s lesen."
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "„root inode“ ist kein Verzeichnis"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Aufruf: %s [Optionen] gerät …\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
-msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, fuzzy, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Gemeinsamer Speicher Segment shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "Nachrichtenwarteschlange msqid=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "zugewiesene Semaphoren = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11763,8 +11924,8 @@ msgstr ""
 
 # similiar message below.
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 # similiar message below.
@@ -11774,8 +11935,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11808,8 +11969,8 @@ msgstr ""
 "Nachrichtenwarteschlange msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11842,8 +12003,8 @@ msgstr ""
 "Semaphorenfeld semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11891,73 +12052,71 @@ msgstr "Pid"
 msgid "invalid iflag: %s"
 msgstr "ungültige ID: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ungültige ID: %s\n"
 
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s von %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "ungültige ID"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ungültige ID: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ist kein blockorientiertes Gerät"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Konnte „seek()“ nicht auf der Festplatte benutzen"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "es ist nicht möglich, die Größe von %s festzustellen"
@@ -12114,36 +12273,31 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12152,12 +12306,12 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "„root inode“ ist kein Verzeichnis"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s ist eingehängt.\t"
@@ -12193,55 +12347,50 @@ msgstr ""
 "\t -n            Byte-Anordnungs-Erkennung abschalten\n"
 "\t -V            Versionsinformation ausgeben und beenden\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: Fehler beim Schreiben von %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): falsche Tabellen-Zeile\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: Konnte „_stext“ nicht in %s finden\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: Profil-Adresse außerhalb des Bereichs. Falsche Map-Datei?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "gesamt"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12250,8 +12399,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12261,69 +12410,61 @@ msgstr ""
 
 # "mkfs aus util-linux-2.10d"
 # "mkfs von util-linux-2.10d"
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s von %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Unbekannter Befehl: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "ungültiger Auszeit-Wert: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "Benutzer"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: Alte Priorität: %d, neue Priorität: %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Aufruf: %s [Optionen] gerät …\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "Aufruf: %s [optionen]\n"
 "    -d | --device <gerät>     zu benutzendes RTC-Gerät (rtc0|rtc1|…)\n"
@@ -12335,8 +12476,8 @@ msgstr ""
 "    -v | --verbose            ausführliche Nachrichten\n"
 "    -V | --version            Version anzeigen\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12344,162 +12485,162 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "RTC-Zeit lesen"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "System-Zeit lesen"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "RTC-Zeit konvertieren"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "RTC-Alarm setzen"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "RTC-Alarm aktivieren"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "RTC-Weck-Alarm setzen"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "RTC-Alarm aktivieren"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "RTC-Zeit konvertieren"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: nicht erkannter Energiesparmodus „%s“\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: interpretiere RTC als UTC …\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Benutze %s-Zeit.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Benutze %s-Zeit.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s: Weckzeit muss angegeben werden\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s nicht für Weckereignisse geeignet\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "Alarm %ld, sys_time %ld, rtc_time %ld, Sekunden %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, fuzzy, c-format
 msgid "time doesn't go backward to %s"
 msgstr "%s: Zeit geht nicht rückwärts zu %s\n"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: Weckereignis von „%s“, benutze %s bei %s\n"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: Weckereignis von „%s“, benutze %s bei %s\n"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() konnte Zeit nicht von %s lesen."
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Nächste Datei: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12557,16 +12698,16 @@ msgstr ""
 "%s: %s\n"
 "„%s --help“ gibt weitere Informationen.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: nicht erkannte Architektur"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Nicht genug Argumente"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Konnte Persönlichkeit nicht auf %s setzen"
@@ -12652,24 +12793,22 @@ msgstr "%s benutzt IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s benutzt Polling\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "Aufruf: %s Programm [Argument …]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12677,150 +12816,150 @@ msgstr ""
 "\n"
 "Für weitere Informationen siehe setarch(8).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "„seek“ gescheitert."
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: Fehler beim Ausführen von %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "Fehler beim Ändern der Zugriffsrechte von %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: Konnte den Prozess „%s“ nicht finden.\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: Fehler beim Ausführen von %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "ungültiger Auszeit-Wert: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Nicht genug Argumente"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "Konnte keinen Speicher für einen Puffer reservieren.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "falsche Geschwindigkeit: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "zu viele alternative Geschwindigkeiten"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "Konnte /dev/%s nicht als Standardeingabe öffnen: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s ist kein zeichenorientiertes Gerät"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: nicht offen für Lesen/Schreiben"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: dup‐Problem: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "Typ: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: gelesen: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: Eingabe‐Überlauf"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12832,69 +12971,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "Benutzer"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "Benutzer"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "„seek“ gescheitert."
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Nächste Datei: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "ist y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "is n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "zugewiesene Semaphoren = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "ungültige ID: %s\n"
@@ -12910,55 +13043,49 @@ msgstr ""
 "Benutzen Sie „%s [optionen] %s“, wenn Sie es tatsächlich starten wollen.\n"
 "Script nicht gestartet.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "Konnte „%s“ nicht öffnen"
 
 # Not really nice…
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script wurde gestartet, die Datei ist %s\n"
 
 # The %s must be at the end, 'cause it contains the \n
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script wurde gestartet: %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: Konnte das Gerät für %s nicht finden\n"
 
 # The %s must be at the end, 'cause it contains the \n
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12967,80 +13094,77 @@ msgstr ""
 "\n"
 "Script beendet: %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script wurde beendet, die Datei ist %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "„openpty“ ist fehlgeschlagen\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Keine ptys mehr.\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "Konnte %s nicht öffnen"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() konnte Zeit nicht von %s lesen."
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "Maximale Anzahl der Segmente = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "Konnte „%s“ nicht öffnen"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() konnte Zeit nicht von %s lesen."
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: unerwartetes Dateiende in %s-Datei\n"
@@ -13051,50 +13175,47 @@ msgid "Argument error."
 msgstr "%s: Fehler bei den Argumenten; Aufruf:\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13104,62 +13225,62 @@ msgstr ""
 "Für weitere Informationen siehe setarch(8).\n"
 
 # This is only used when strerror(errno) is much too long
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "Kann keinen neuen Prozess erzeugen (fork)"
 
 # This is only used when strerror(errno) is much too long
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "Kann keinen neuen Prozess erzeugen (fork)"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "kann Stromsparmodus nicht (zurück)setzen\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "Konnte das Gerät %s nicht zum Schreiben öffnen\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "„klogctl“ Fehler: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Fehler beim Schreiben des Bildschirmdumps\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Konnte %s nicht öffnen\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: Die Umgebungsvariable TERM ist nicht gesetzt.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: Unbekanntes Signal %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13189,144 +13310,146 @@ msgstr "Prozesserzeugung (fork): %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Aufruf: %s [Optionen] gerät …\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "ungültige ID"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "ungültiger Auszeit-Wert: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: Konnte eine temporäre Datei nicht öffnen.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: Kann die Geschwindigkeit nicht setzen: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Konnte die Größe der Festplatte nicht feststellen"
 
 # XXX – Have to look at other OSs translation for Broadcast
 # Message
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Rundsendenachricht von %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: werde nicht aus %s lesen – benutze Standardeingabe.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "„seek“ gescheitert."
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Nächste Datei: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "Aufruf: namei [-mx] Dateiname [Dateiname …]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: kann den Namen Ihres TTYs nicht feststellen\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: Ihr Schreibzugriff ist abgeschaltet.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s ist nicht auf %s eingeloggt.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s hat Benachrichtigung auf %s deaktiviert\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s ist nicht eingeloggt\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s hat Benachrichtigung deaktiviert\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s ist mehr als einmal eingeloggt; schreibe auf %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Eingabezeile ist zu lang.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Nachricht von %s@%s (als %s) auf %s um %s …"
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Nachricht von %s@%s auf %s um %s …"
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "„malloc“ schlug fehl"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13508,7 +13631,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13711,7 +13834,7 @@ msgstr ""
 "\n"
 "Muster wurde nicht gefunden\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Muster wurde nicht gefunden"
 
@@ -13776,7 +13899,7 @@ msgstr "hexdump: Ungültiges Format {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: ungültiges Umwandlungszeichen %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13804,7 +13927,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13812,81 +13935,81 @@ msgstr ""
 "%s: Aufruf: %s [-zahl] [-p zkette] [-cefnrs] [+zeile] [+/muster/] [dateien]\n"
 
 # libc: "Die Option „%s“ erfordert ein Argument\n"
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: Option erfordert ein Argument -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: unzulässige Option -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "…springe vorwärts\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "…springe rückwärts\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Keine nächste Datei"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Kein vorhergehende Datei"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Fehler beim Lesen aus %s-Datei\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: unerwartetes Dateiende in %s-Datei\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: unbekannter Fehler in %s-Datei\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Konnte keine temporäre Datei anlegen.\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Fehler in regulärem Ausdruck: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(Dateiende)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Kein gemerkter Suchtext"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Kann nicht öffnen "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "gespeichert"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !befehl im rflag-Modus nicht erlaubt.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() fehlgeschlagen, später versuchen\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Nächste Datei: "
 
@@ -13956,8 +14079,8 @@ msgstr "Aufruf: %s [Optionen] gerät …\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13973,39 +14096,107 @@ msgstr "%s: fehlschlagenes Öffnen von: %s\n"
 msgid "no input file specified"
 msgstr "Es wurde keine „--date“-Option angegeben.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Aufruf: %s [Optionen] gerät …\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "Probleme beim Lesen der terminfo-Datenbank"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Unbekannte Escape-Sequenz in der Eingabe: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Eingabezeile ist zu lang.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Aufruf:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Fehler beim Schließen von Datei\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Tut mir leid, Sie können das Tag nicht-leerer Partitionen ändern.\n"
+
+# XXX – Merge with next strings.
+#~ msgid "Warning: partition %s "
+#~ msgstr "Warnung: Partition %s "
+
+# XXX – Merge with next strings.
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Warnung: Partitionen %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "and %s überlappen sich\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "gerät: etwas wie /dev/hda oder /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "Bytes"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Aufruf: %s [Optionen] gerät …\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Aufruf: %s [Optionen] gerät …\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -14158,9 +14349,6 @@ msgstr "Eingabezeile ist zu lang.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [oder --help]:      diese Meldung ausgeben"
 
-#~ msgid "dangerous options:"
-#~ msgstr "gefährliche Optionen:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [oder --show-geometry]: die Vorstellungen des Kernels zur "
@@ -14168,23 +14356,6 @@ msgstr "Eingabezeile ist zu lang.\n"
 #~ "                                 ausgeben"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [oder --show-pt-geometry]: aus der Partitionstabelle geratene "
-#~ "Geometrie\n"
-#~ "                                    ausgeben"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [oder --show-extended]: auch die erweiterten Partitionen mit "
-#~ "auflisten\n"
-#~ "                               bzw. bei Eingabe Deskriptoren für sie "
-#~ "erwarten"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14246,56 +14417,9 @@ msgstr "Eingabezeile ist zu lang.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "        getopt [Optionen] [--] Optionszeichenkette Parameter\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "        getopt [Optionen] -o|--options Optionszeichenkette [Optionen] "
-#~ "[--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "               Parameter\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative          lange Optionen dürfen auch mit einfachem - "
-#~ "beginnen\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                 dieser kleine Hilfe\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=lopt     zu erkennende lange Optionen\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=progname        der Name, der in Fehlermeldungen benutzt "
-#~ "wird\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=OptZKette    zu erkennende kurze Optionen\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                Fehlermeldungen von getopt(3) unterdrücken\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output         keine normale Ausgabe\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=Shell          Konventionen für Shell-Quoting setzen\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                 auf getopt(1)-Version testen\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unquote              die Ausgabe nicht quoten\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version              Versionsinformation ausgeben\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (enhanced) 1.1.4\n"
 
diff --git a/po/es.po b/po/es.po
index 9cad014fe..2fa32ee32 100644
--- a/po/es.po
+++ b/po/es.po
@@ -15,8 +15,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-04-04 03:31+0200\n"
 "Last-Translator: Santiago Vila Doncel <sanvila@unex.es>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -113,29 +113,29 @@ msgstr "vuelve a leer la tabla de particiones"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "obtiene el tama�o en sectores de 512 bytes"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, fuzzy, c-format
 msgid "%s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "no se puede abrir %s"
@@ -215,7 +215,7 @@ msgid "Verifying ... "
 msgstr "Verificando... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "No se puede abrir el fichero '%s'"
@@ -255,15 +255,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -276,7 +276,7 @@ msgstr "%s de %s\n"
 msgid "cannot stat file %s"
 msgstr "No se puede efectuar `stat' sobre el dispositivo %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -325,8 +325,8 @@ msgid "stat failed: %s"
 msgstr "(Siguiente fichero: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty ha fallado\n"
@@ -561,55 +561,55 @@ msgstr ""
 msgid "compiled without -x support"
 msgstr "%s: se ha compilado sin soporte para -x\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Correcto\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s [-larvsmf] /dev/nombre\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s est� montado.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "�Est� seguro de que desea continuar?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "comprobaci�n anulada.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "N�mero de zona < FIRSTZONE en el fichero `%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "N�mero de zona >= ZONES en el fichero `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Eliminar bloque"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Error de lectura: no se puede buscar en un bloque en el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Error de lectura: bloque incorrecto en el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -618,303 +618,303 @@ msgstr ""
 "Error interno: se est� intentando escribir un bloque incorrecto\n"
 "La petici�n de escritura no se tiene en cuenta\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "Error de b�squeda en write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Error de escritura: bloque incorrecto en el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "Error de b�squeda en write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "No se puede escribir el superbloque"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "No se puede escribir la tabla de nodos-i"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "No se puede escribir la tabla de zonas"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "No se pueden escribir nodos-i"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "Error de b�squeda"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "No se puede asignar b�feres para mapas"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "No se puede leer el superbloque"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "N�mero m�gico incorrecto en el superbloque"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "S�lo se da soporte a bloques o zonas de 1k"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "Campo s_imap_blocks incorrecto en superbloque"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "Campo s_zmap_blocks incorrecto en superbloque"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "No se puede asignar b�fer para la tabla de nodos-i"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "No se puede asignar b�fer para la tabla de nodos-i"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "No se puede asignar b�fer para los nodos-i"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "No se puede asignar b�fer para el n�mero de nodos-i"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "No se puede asignar b�fer para el n�mero de zonas"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "No se puede leer la tabla de nodos-i"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "No se puede leer la tabla de zonas"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "No se pueden leer los nodos-i"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Atenci�n: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld nodos-i\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld bloques\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primera zona de datos=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tama�o de zona=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Tama�o m�ximo=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estado del sistema de ficheros=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "Longitud de nombre=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "El nodo-i %d se ha marcado como no utilizado, pero se utiliza para\n"
 "el fichero '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Marcar en uso"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "El fichero `%s' tiene el modo %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Atenci�n: n�mero de nodos-i demasiado elevado.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "El nodo-i ra�z no es un directorio"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr ""
 "El bloque ya se ha utilizado anteriormente.\n"
 "Ahora est� en el fichero `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Borrar"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "El bloque %d en el fichero `%s' est� marcado como no utilizado."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Correcto"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "El directorio `%s' contiene un n�mero de nodo-i incorrecto\n"
 "para el fichero '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Eliminar"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: directorio incorrecto: '.' no es el primero\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: directorio incorrecto: '..' no es el segundo\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "Error interno"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: directorio incorrecto: tama�o < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "Error de b�squeda en bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "No se ha borrado el modo del nodo-i %d."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "El nodo-i %d no est� en uso; marcado como en uso en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "El nodo-i %d est� en uso; marcado como no en uso en el mapa de bits."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Establecer"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Nodo-i %d (modo = %07o), i_nlinks=%d, contados=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Establece i_nlinks en n�mero contado"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zona %d: marcada como en uso; ning�n fichero la utiliza."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Eliminar marca"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zona %d: en uso, contados=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zona %d: no en uso, contados=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "tama�o de nodo-i incorrecto"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "tama�o de nodo-i v2 incorrecto"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "Se necesita terminal para reparaciones interactivas"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "No se puede abrir '%s'"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s est� limpio; no se comprueba.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forzando comprobaci�n del sistema de ficheros en %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 "El sistema de ficheros en %s contiene elementos extra�os; debe comprobarse.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -923,12 +923,12 @@ msgstr ""
 "\n"
 "%6ld nodos-i utilizados (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zonas utilizadas (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -951,7 +951,7 @@ msgstr ""
 "------\n"
 "%6d ficheros\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1075,7 +1075,7 @@ msgstr "demasiados nodos-i; el m�ximo es 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "no hay suficiente espacio, se necesitan al menos %lu bloques"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -1246,10 +1246,8 @@ msgstr "%6.2f%% (%+d bytes)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Error al cerrar el fichero\n"
+msgid "cannot close file %s"
+msgstr "No se puede abrir el fichero '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1363,88 +1361,98 @@ msgstr ""
 "significa casi con certeza que algunos ficheros de dispositivos ser�n "
 "err�neos.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Uso: %s [-c | -l nombrefichero] [-nXX] [-iXX] /dev/nombre [bloques]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s est� montado; no se crear� un sistema de ficheros aqu�"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "Error de b�squeda de bloque de inicio en write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "No se puede borrar el sector de inicio"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "Error de b�squeda en write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "No se puede escribir el superbloque"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "No se puede escribir la tabla de nodos-i"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "No se puede escribir la tabla de zonas"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "No se pueden escribir los nodos-i"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "Error de b�squeda en write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "Error de escritura en write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "Hay demasiados bloques incorrectos"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "No hay suficientes bloques correctos"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "No se puede asignar b�feres para mapas"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "No se puede asignar b�feres para mapas"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "No se puede asignar b�fer para los nodos-i"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld nodos-i\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld bloques\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1453,99 +1461,99 @@ msgstr ""
 "Tama�o m�ximo=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "Error de b�squeda durante comprobaci�n de bloques"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores extra�os en do_check: probablemente existan errores\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "Error de b�squeda en check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "Bloques incorrectos antes del �rea de datos: no se puede crear\n"
 "el sistema de ficheros"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d bloques incorrectos\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "Un bloque incorrecto\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "No se puede abrir el fichero de bloques incorrectos"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "No se puede leer la unidad de disco"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "tama�o de nodo-i incorrecto"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "error de strtol: no se ha especificado el n�mero de bloques"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "El estado de %s es %d"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty ha fallado\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: dispositivo ocupado"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "no se puede obtener el tama�o de %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "No se intentar� crear el sistema de ficheros en '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "N�mero de sectores"
@@ -1883,7 +1891,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "Error de b�squeda en write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2229,7 +2237,7 @@ msgid "   Logical"
 msgstr "   L�gica"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -2900,12 +2908,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Orden de etiqueta de disco BSD (m para obtener ayuda): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Primer %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s o +tama�o o +tama�oM o +tama�oK"
@@ -3051,7 +3059,7 @@ msgid "tracks/cylinder"
 msgstr "pistas/cilindro"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cilindros"
 
@@ -3118,12 +3126,12 @@ msgstr "Se ha creado el n�mero m�ximo de particiones\n"
 msgid "This partition already exists.\n"
 msgstr "Esta partici�n ya existe.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Atenci�n: demasiadas particiones (%d, el valor m�ximo es %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3327,7 +3335,7 @@ msgstr "Debe establecer"
 msgid "heads"
 msgstr "cabezas"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sectores"
 
@@ -3761,7 +3769,7 @@ msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Inicio    Comienzo      Fin      Bloques  Id  Sistema\n"
 
 # Nota: si se pone Dispositivo no queda bien el resto de la l�nea.
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Disposit."
 
@@ -3845,7 +3853,7 @@ msgstr "El total de sectores asignados %d supera el m�ximo %lld\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld sectores no asignados\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -4003,39 +4011,39 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Se est�n sincronizando los discos.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partici�n %d no tiene ninguna �rea de datos\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nuevo principio de datos"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Orden avanzada (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "N�mero de cabezas"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "N�mero de sectores"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Atenci�n: estableciendo desplazamiento de sector para compatibilidad con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4044,34 +4052,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "El disco %s no contiene una tabla de particiones v�lida\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "No se puede abrir %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: orden desconocida\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este n�cleo encuentra el tama�o del sector por s� mismo; no se tiene en "
 "cuenta la opci�n -b\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4080,18 +4088,18 @@ msgstr ""
 "Atenci�n: la opci�n -b (establecer tama�o de sector) debe utilizarse con un "
 "dispositivo especificado\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Se ha detectado una etiqueta de disco OSF/1 en %s, entrando en el modo de\n"
 "etiqueta de disco.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Orden (m para obtener ayuda): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4100,16 +4108,16 @@ msgstr ""
 "\n"
 "El fichero de inicio actual es: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Escriba el nombre del nuevo fichero de inicio: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "No se ha modificado el fichero de inicio\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4436,9 +4444,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tHa elegido un nombre de fichero de inicio no habitual.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "S�lo puede cambiar la etiqueta de las particiones no vac�as.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "�nicamente el superusuario puede cambiar el reloj del sistema.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4456,7 +4464,7 @@ msgstr ""
 "Escriba S� si est� seguro de querer dar una etiqueta distinta a esta "
 "partici�n.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "S�\n"
 
@@ -4669,7 +4677,7 @@ msgstr "Espacio no utilizado - sectores 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espacio no utilizado - sectores %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4678,7 +4686,7 @@ msgstr ""
 "Ya hay otras particiones que abarcan el disco completo.\n"
 "Suprima algunas o reduzca su tama�o antes de volver a intentarlo.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4687,12 +4695,12 @@ msgstr ""
 "Se recomienda que la partici�n 11\n"
 "abarque el disco completo y sea del tipo `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "El sector %d ya est� asignado\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4703,7 +4711,7 @@ msgstr ""
 "el valor %d %s que ha especificado se solapa con otra partici�n.\n"
 "La entrada que ha realizado se ha cambiado por %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4712,7 +4720,7 @@ msgstr ""
 "Si desea mantener la compatibilidad con SunOS/Solaris, se recomienda dejar\n"
 "esta partici�n como disco completo (5), con principio en 0, con %u sectores\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4726,7 +4734,7 @@ msgstr ""
 "Escriba S� si est� seguro de que desea que la partici�n\n"
 "est� marcada con 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4746,7 +4754,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4759,28 +4767,28 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Indic.  Principio   Fin    Bloques  Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Sectores adicionales por cilindro"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Factor de interleave"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Velocidad de rotaci�n (r.p.m.)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -5241,7 +5249,7 @@ msgstr "Disco %s: no se puede obtener la geometr�a\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: no se puede obtener el tama�o\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5252,22 +5260,22 @@ msgstr ""
 "disco entero. Usar fdisk con ella probablemente no tiene sentido.\n"
 "[Use la opci�n --force si realmente desea realizar esta operaci�n.]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Atenci�n: HDIO_GETGEO indica que hay %lu cabezas\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Atenci�n: HDIO_GETGEO indica que hay %lu sectores\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Atenci�n: HDIO_GETGEO indica que hay %lu cilindros\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5276,7 +5284,7 @@ msgstr ""
 "Atenci�n: n�mero improbable de sectores (%lu); normalmente 63 como m�ximo\n"
 "Esto causar� problemas con el software que direccione con Cil./Cab./Sector\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5285,7 +5293,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabezas, %lu sectores/pista\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5293,7 +5301,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para cabeza: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5302,7 +5310,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para sector: %lu\n"
 "(debe estar entre 1 y %lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5311,7 +5319,7 @@ msgstr ""
 "%s de partici�n %s tiene un valor imposible para cilindros: %lu\n"
 "(debe estar entre 0 y %lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5320,12 +5328,12 @@ msgstr ""
 "Id  Nombre\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Volviendo a leer la tabla de particiones...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5335,26 +5343,26 @@ msgstr ""
 "La orden para volver a leer la tabla de particiones ha fallado.\n"
 "Reinicie el sistema ahora, antes de utilizar mkfs.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Error al cerrar %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: esta partici�n no existe\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "Formato no reconocido; utilizando sectores\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato no implementado; utilizando %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5363,12 +5371,12 @@ msgstr ""
 "Unidades = cilindros de %lu bytes, bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp.  Inic. Princ.   Fin   N�cil    N�bloq.   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5377,12 +5385,12 @@ msgstr ""
 "Unidades = sectores de 512 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp.  Inicio  Principio   Fin   N� sect.  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5391,13 +5399,13 @@ msgstr ""
 "Unidades = bloques de 1024 bytes, contando desde %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp.  Inic.  Principio   Fin    N�bloques Id  Sistema\n"
 
 # FIXME: �Qu� es un mebibyte?
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5407,35 +5415,35 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp.  Inic Princ.  Fin    MiB    N�bloques Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tprincipio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,"
 "%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partici�n termina en el cilindro %ld, m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "No se ha encontrado ninguna partici�n\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5446,53 +5454,43 @@ msgstr ""
 "  para Cil./Cab./Sect.=*/%ld/%ld (en lugar de %ld/%ld/%ld).\n"
 "Para este listado se presupondr� esta geometr�a.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "No existe ninguna tabla de particiones.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Extra�amente s�lo hay %d particiones definidas.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Atenci�n: la partici�n %s tiene tama�o 0 pero no est� marcada como vac�a\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Atenci�n: la partici�n %s tiene tama�o 0 y es iniciable\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Atenci�n: la partici�n %s tiene tama�o 0 y principio distinto de cero\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Atenci�n: la partici�n %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
-msgstr "no se encuentra dentro de la partici�n %s\n"
-
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Atenci�n: las particiones %s "
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
+msgstr "Atenci�n: la partici�n %s contiene parte de "
 
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "y %s se solapan\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Atenci�n: la partici�n %d est� vac�a\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5501,17 +5499,17 @@ msgstr ""
 "Atenci�n: la partici�n %s contiene parte de la tabla de particiones\n"
 "(sector %lu), y la destruir� cuando se llene\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Atenci�n: la partici�n %s empieza en el sector 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Atenci�n: la partici�n %s finaliza m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5519,17 +5517,17 @@ msgstr ""
 "Como m�ximo una de las particiones primarias puede ser extendida\n"
 " (aunque esto no es un problema bajo Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Atenci�n: la partici�n %s no empieza en un l�mite de cilindro\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Atenci�n: la partici�n %s no termina en un l�mite de cilindro\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5538,7 +5536,7 @@ msgstr ""
 "Esto no es poblema para LILO, pero el MBR de DOS no se iniciar� con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5546,7 +5544,7 @@ msgstr ""
 "Atenci�n: normalmente s�lo es posible iniciar desde particiones primarias.\n"
 "LILO no tiene en cuenta el indicador de iniciable.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5556,11 +5554,11 @@ msgstr ""
 "Esto no es problema para LILO, pero el MBR de DOS no iniciar� con este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "comienzo"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5568,24 +5566,24 @@ msgstr ""
 "Partici�n %s: principio: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado "
 "(%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "final"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "Partici�n %s: fin: (cil.,cab.,sect.) esperado (%ld,%ld,%ld) detectado (%ld,"
 "%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "La partici�n %s termina en el cilindro %ld, m�s all� del final del disco\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5594,7 +5592,7 @@ msgstr ""
 "Atenci�n: se desplaza el comienzo de la partici�n extd de %ld a %ld\n"
 "(Solamente para visualizarlo. No se cambia su contenido.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5603,132 +5601,132 @@ msgstr ""
 "DOS y Linux interpretar�n el contenido de forma diferente.\n"
 "\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "demasiadas particiones - se ignoran las posteriores al n� (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "��rbol de particiones?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Administrador de disco detectado; no se puede tratar esto\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "Detectada firma DM6 - abandonando\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "Situaci�n an�mala: �partici�n extendida de tama�o 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "Situaci�n an�mala: �partici�n BSD de tama�o 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: tipo de tabla de particiones no reconocido\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Se ha especificado el indicador -n: no se ha producido ning�n cambio\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Error al guardar los sectores antiguos; anulando la operaci�n\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "L�nea de entrada larga o incompleta; se abandona la operaci�n\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "Error de entrada: se esperaba `=' despu�s del campo %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "Error de entrada: car�cter inesperado %c tras campo %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "Entrada no reconocida: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "N�mero demasiado elevado\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "Datos extra�os tras el n�mero\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "No hay espacio para descriptor de partici�n\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "No se puede crear partici�n extendida adyacente\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "Demasiados campos de entrada\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "No queda m�s espacio\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Tipo no permitido\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Atenci�n: el tama�o dado (%lu) supera el tama�o m�ximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Atenci�n: partici�n vac�a\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Atenci�n: principio de partici�n incorrecto (antes %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "Indicador de iniciable no reconocido; elija - o *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "�Especificaci�n parcial de cil,cab,sect?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Partici�n extendida en ubicaci�n no esperada\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "Entrada incorrecta\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "Hay demasiadas particiones\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5740,100 +5738,180 @@ msgstr ""
 "<cil,cab,sec>\n"
 "Normalmente s�lo debe especificar <principio> y <tama�o> (y quiz�s <tipo>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Uso: %s [opciones] dispositivo ...\n"
+msgstr "Uso:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "dispositivo: similar a /dev/hda or /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d particiones:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "opciones peligrosas:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -g [o --show-geometry]:  Imprime la idea del n�cleo sobre la geometr�a"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [o --show-extended]:  Muestra tambi�n las particiones extendidas en\n"
+"                             salida o espera sus descriptores en entrada"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\t Enumera las particiones activas del dispositivo\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2 ... activar particiones n1 ..., desactivar el resto\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An dispositivo\t activa la partici�n n, desactiva el resto\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5842,62 +5920,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "�ninguna orden?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %llu bloques\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uso: sfdisk --print-id dispositivo n�mero-partici�n\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "uso: sfdisk --change-id dispositivo n�mero-partici�n Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uso: sfdisk --id dispositivo n�mero-partici�n [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "puede especificar s�lo un dispositivo (salvo con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "No se puede abrir %s para lectura-escritura\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "No se puede abrir %s para lectura\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabezas, %ld sectores por pista\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "No se puede obtener el tama�o de %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte activo incorrecto: 0x%x en lugar de 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5905,7 +5983,7 @@ msgstr ""
 "Fin\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5914,35 +5992,35 @@ msgstr ""
 "Tiene %d particiones primarias activas. No tiene importancia para LILO,\n"
 "pero el MBR de DOS s�lo puede iniciar discos con una partici�n activa.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partici�n %s tiene el identificador %x y no est� oculta\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificador %lx incorrecto\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Actualmente este disco est� en uso.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Error muy grave: no se puede encontrar %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Atenci�n: %s no es un dispositivo de bloques\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Comprobando que nadie est� utilizando este disco en este momento...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5957,30 +6035,30 @@ msgstr ""
 "esta\n"
 "comprobaci�n.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilice el indicador --force para eludir todas las comprobaciones.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "Correcto\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situaci�n anterior:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partici�n %d no existe; no se puede cambiar\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Situaci�n nueva:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5989,23 +6067,23 @@ msgstr ""
 "nada.\n"
 "(Si realmente desea realizar esta operaci�n, use la opci�n --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "El sistema no encuentra adecuada esta operaci�n; probablemente deba "
 "responder No\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "�Est� satisfecho con esta operaci�n? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�Desea escribir esta informaci�n en el disco? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -6014,16 +6092,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada antes de lo previsto\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Se est� saliendo; no se ha cambiado nada\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda con una de las entradas siguientes: y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6032,7 +6110,7 @@ msgstr ""
 "La nueva tabla de particiones se ha escrito correctamente\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6064,101 +6142,103 @@ msgstr "Se est�n sincronizando los discos.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s ha tenido �xito.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "Error de b�squeda"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: no se puede abrir %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: no se ha encontrado"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: �error %d al descomprimir! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Forzando comprobaci�n del sistema de ficheros en %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6166,58 +6246,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "No se ha podido abrir %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "Se ha ejecutado umount en %s\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Desmontando los sistemas de ficheros restantes..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Desmontando los sistemas de ficheros restantes..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: argumento desconocido: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6234,33 +6314,84 @@ msgstr "Opci�n larga vac�a tras argumento -l o --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "Shell desconocido tras argumento -s o --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [opciones] -o|--options cadenaopciones [opciones] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Permite opciones largas con un solo - "
+"inicial\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Esta peque�a gu�a de uso\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=opclargas  Opciones largas para reconocer\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
 msgstr ""
+"  -n, --name=nombreprograma    El nombre con el que se informa de los "
+"errores\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=cadenaopciones Opciones cortas que se reconocen\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Desactiva informaci�n de errores mediante\n"
+"                               getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           No hay salida normal\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=int�rpr.�rdenes  Define las convenciones de cita del "
+"int�rprete\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Prueba para la versi�n de getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unquote                No entrecomilla el resultado\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Muestra informaci�n de versi�n\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "Falta el argumento cadenaopciones"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "Error interno; contacte con el desarrollador."
 
@@ -6734,92 +6865,110 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "No se puede establecer el valor de �poca en el n�cleo.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d particiones:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                Indica al reloj de hardware el tipo de Alpha (ver hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "No se puede establecer el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: fallo al abrir %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s no admite argumentos que no sean opciones. Ha especificado %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6828,7 +6977,7 @@ msgstr ""
 "Ha especificado varias funciones.\n"
 "S�lo puede llevar a cabo una funci�n a la vez.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6837,7 +6986,7 @@ msgstr ""
 "%s: las opciones --utc y --localtime se excluyen mutuamente. Ha especificado "
 "ambas.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6846,7 +6995,7 @@ msgstr ""
 "%s: las opciones --adjust y --noadjfile se excluyen mutuamente. Ha "
 "especificado ambas.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6855,28 +7004,28 @@ msgstr ""
 "%s: las opciones --adjust y --noadjfile se excluyen mutuamente. Ha "
 "especificado ambas.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: Con --noadjfile, debe especificarse o bien --utc o bien --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Hora no utilizable. No se puede establecer el reloj.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "�nicamente el superusuario puede cambiar el reloj de hardware.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "�nicamente el superusuario puede cambiar el reloj del sistema.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6884,12 +7033,12 @@ msgstr ""
 "S�lo el superusuario puede cambiar el valor de �poca del reloj de hardware "
 "del n�cleo.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "No se puede acceder al reloj de hardware por ning�n m�todo conocido.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7073,7 +7222,7 @@ msgid "failed to read mtab"
 msgstr "No se puede ejecutar `stat' sobre %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "No se puede asignar el b�fer.\n"
@@ -7115,72 +7264,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: montaje err�neo"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: fallo al abrir %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "No se puede asignar el b�fer.\n"
@@ -7268,7 +7457,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: error de PAM; anulando: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Contrase�a: "
 
@@ -7721,47 +7910,48 @@ msgstr "Excesivos avances de l�nea"
 msgid "too many bare linefeeds."
 msgstr "Demasiados avances de l�nea solos.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "El inicio de sesi�n ha superado el tiempo de espera tras %d segundos\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo inicio de sesi�n: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "desde %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "en %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "fall� la escritura a stdout"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Error de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Error de inicio de sesi�n en %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d errores de inicio de sesi�n desde %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d errores de inicio de sesi�n en %s, %s"
@@ -7791,7 +7981,7 @@ msgstr "mount: permiso denegado"
 msgid "setuid failed"
 msgstr "setuid() ha fallado"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "La ejecuci�n (exec) ha fallado\n"
@@ -7838,8 +8028,8 @@ msgstr "%s: No se puede establecer el contexto de %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: no se puede desbloquear %s: %s (los cambios todav�a est�n en %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "La bifurcaci�n (fork) ha fallado\n"
@@ -7892,24 +8082,21 @@ msgstr "Valor de a�o no permitido: utilice 1-9999"
 msgid "%s %d"
 msgstr "%s de %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "uso: cal [-13smjyV] [[mes] a�o]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -8021,32 +8208,32 @@ msgstr " Eliminar"
 msgid "failed to add line to output"
 msgstr "No se puede asignar el b�fer.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "error de b�squeda"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "No se puede asignar el b�fer.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: no se puede leer %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "No se puede asignar el b�fer.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8057,91 +8244,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "�rdenes disponibles:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "No hay ning�n directorio %s\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: fallo al abrir %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "No se puede asignar el b�fer.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "No se puede asignar el b�fer.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "No se puede asignar el b�fer.\n"
@@ -8166,12 +8378,12 @@ msgstr "%s: no se puede encontrar el proceso \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: se�al desconocida %s; se�ales v�lidas:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "uso: %s [ -s se�al | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ se�al ]\n"
@@ -8191,84 +8403,83 @@ msgstr "Tama�oDelBloque: %d\n"
 msgid "connect %s"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Siguiente fichero: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "El n�mero de `%s' a `%s' est� fuera de rango\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: nombre de recurso desconocido: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: nombre de prioridad desconocida: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8408,7 +8619,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: fallo al abrir %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8426,12 +8637,13 @@ msgstr "%s: fallo al abrir %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: fallo al abrir %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8439,7 +8651,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8462,40 +8674,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "No se ha podido abrir %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Se han obtenido %d bytes de %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "La ejecuci�n (exec) ha fallado\n"
@@ -8515,24 +8727,12 @@ msgstr "No se puede ejecutar `stat' sobre %s"
 msgid "%s - No such file or directory\n"
 msgstr "El nodo-i ra�z no es un directorio"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "uso: namei [-mx] nombreruta [nombreruta ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d particiones:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8544,19 +8744,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "argumento --date demasiado largo\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8566,169 +8765,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: fallo al cambiar el nombre de %s a %s: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argumento -l incorrecto %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Escribir"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "read %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: fallo al abrir %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "No se puede ejecutar `stat' sobre %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "shutdown: No se puede ejecutar umount %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "No se puede bloquear el fichero de bloqueo %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Error al leer %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "N�mero inv�lido: %s\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "N�mero inv�lido: %s\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "N�mero inv�lido: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8736,29 +8933,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8792,43 +8988,44 @@ msgid "%s: write failed"
 msgstr "Error de b�squeda"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "bytes"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8926,63 +9123,63 @@ msgstr "Error al cambiar el modo de %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "No se puede cambiar el nombre %s por %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: el usuario \"%s\" no existe.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: no se puede obtener informaci�n sobre el dispositivo %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", desplazamiento %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", tama�o l�mite %lld"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cifrado %s (tipo %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", desplazamiento %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipo de cifrado %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: no se puede obtener informaci�n sobre el dispositivo %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: no se puede abrir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: no existe permiso para mirar en /dev/loop#"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: no se ha encontrado ning�n dispositivo de bucle libre"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8993,59 +9190,57 @@ msgstr ""
 "a\n"
 "       realizar la compilaci�n o `modprobe loop'.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "No queda memoria al aumentar el tama�o del b�fer.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "El sector %d ya est� asignado\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "mount: %s%s est� protegido contra escritura; se monta como s�lo lectura"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "No se pudo bloquear en memoria, saliendo.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ejecuci�n correcta\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ejecuci�n correcta\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: no se puede suprimir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Este montaje se ha compilado sin soporte de bucle. Vuelva a realizar la "
 "compilaci�n.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9053,7 +9248,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "uso:\n"
 "  %s dispositivo_bucle                                   # dar informaci�n\n"
@@ -9062,48 +9257,45 @@ msgstr ""
 "usados\n"
 "  %s [ -e cifrado ] [ -o despl ] {-f|disp_bucle} fichero # configurar\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: no se puede abrir el dispositivo %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: dispositivo ocupado"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9664,167 +9856,170 @@ msgstr "Error en la llamada xstrndup"
 msgid "not enough memory"
 msgstr "No hay suficiente memoria"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: EOF inesperado en el fichero %s\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "La ejecuci�n (exec) ha fallado\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ha fallado"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "Error de b�squeda"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "No se puede escribir la p�gina de firma"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Nombre"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "swapon: atenci�n: %s tiene permisos %04o que no son seguros, se sugiere "
 "%04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 "swapon: atenci�n: %s tiene permisos %04o que no son seguros, se sugiere "
 "%04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "swapon: omitiendo el fichero %s; parece que tiene huecos.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "Error de b�squeda"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s en %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "fsync ha fallado"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "No es el superusuario.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10100,7 +10295,7 @@ msgstr "Se ha seleccionado la partici�n %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10160,19 +10355,13 @@ msgstr "   p   Imprime la tabla de particiones BSD"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "El disco %s no contiene una tabla de particiones v�lida\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10183,47 +10372,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "�rdenes disponibles:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: fallo al abrir %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "No se puede asignar el b�fer.\n"
@@ -10351,7 +10539,7 @@ msgstr "Error al escribir la partici�n en %s\n"
 msgid "failed to set pid %d's policy"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "%s: fallo al abrir %s\n"
@@ -10622,7 +10810,7 @@ msgstr "%s: %ld umbral predeterminado y %ld tiempo de espera predeterminado\n"
 msgid "Can't set signal handler"
 msgstr "No se puede establecer el manejador de se�ales"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday ha fallado"
 
@@ -10631,7 +10819,7 @@ msgstr "gettimeofday ha fallado"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "No se puede emitir CYGETMON en %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10639,12 +10827,12 @@ msgstr ""
 "%s: %lu enteros, %lu/%lu caracteres; fifo: %lu umbral, %lu tiempo_espera, "
 "%lu m�ximo, %lu ahora\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f enteros/seg.; %f recepci�n, %f env�o (caracteres/seg.)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10652,7 +10840,7 @@ msgstr ""
 "%s: %lu enteros, %lu caracteres; fifo: %lu umbral, %lu tiempo_espera, %lu "
 "m�ximo, %lu ahora\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f enteros/seg.; %f recepci�n (caracteres/seg.)\n"
@@ -10744,124 +10932,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "no se puede abrir %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Uso: %s [opciones] dispositivo ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Orden desconocida: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "No hay ning�n directorio %s\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync ha fallado"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Siguiente fichero: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "�ninguna orden?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync ha fallado"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10869,43 +11040,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Hay demasiados argumentos.\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valor establecido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "No se ha especificado la opci�n --date.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "se esperaba un n�mero, pero se obtuvo '%s'"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
@@ -10913,100 +11084,100 @@ msgstr "La asignaci�n de memoria (malloc) ha fallado"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s necesita un argumento\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: no se puede abrir %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "N�mero inv�lido: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "La bifurcaci�n (fork) ha fallado\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "No se ha especificado la opci�n --date.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "No se ha especificado la opci�n --date.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "El estado de %s es %d"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "El nodo-i ra�z no es un directorio"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "Error de b�squeda"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "Error de b�squeda"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11015,101 +11186,92 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() no ha podido leer la hora de %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "No se ha especificado la opci�n --date.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "El nodo-i ra�z no es un directorio"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "Error de b�squeda"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Uso: %s [opciones] dispositivo ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Segmento de memoria compartida shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "Cola de mensajes msqid=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "sem�foros asignados = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11610,8 +11772,8 @@ msgstr ""
 "Segmento de memoria compartida shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11620,8 +11782,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11654,8 +11816,8 @@ msgstr ""
 "Cola de mensajes msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11688,8 +11850,8 @@ msgstr ""
 "semid de matriz de sem�foros=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11737,71 +11899,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "identificador inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "identificador inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "identificador inv�lido"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "identificador inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s no es un dispositivo de bloques"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "no se puede obtener el tama�o de %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "No se puede buscar en la unidad de disco"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "no se puede abrir %s"
@@ -11957,48 +12117,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "El nodo-i ra�z no es un directorio"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s est� montado.\t "
@@ -12037,55 +12192,50 @@ msgstr ""
 "bytes\n"
 "         -V            Muestra la versi�n y sale\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: error al escribir %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Paso de sondeo: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): l�nea de mapa incorrecta\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s direcci�n del perfil fuera de rango. �Fichero `map' incorrecto?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12094,239 +12244,230 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Orden desconocida: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "bad timeout value: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "usuario"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Error al escribir la partici�n en %s\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: prioridad antigua %d, nueva prioridad %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Uso: %s [opciones] dispositivo ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "lectura/escritura"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "sem�foros asignados = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "montaje err�neo"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "Error de b�squeda"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "La ejecuci�n (exec) de rc ha fallado\n"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "lectura/escritura"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "gettimeofday ha fallado"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: tipo de tabla de particiones no reconocido\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Utilizando %s.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Utilizando %s.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s no es un dispositivo lp.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Mensaje de %s@%s el %s a las %s ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Mensaje de %s@%s el %s a las %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "%s: fallo al abrir %s\n"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Siguiente fichero: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12377,17 +12518,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr "Escriba `getopt --help' para obtener m�s informaci�n.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: tipo de tabla de particiones no reconocido\n"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "Hay demasiados argumentos.\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "Error al escribir la partici�n en %s\n"
@@ -12472,173 +12613,171 @@ msgstr "%s utilizando IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s utilizando sondeo\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "uso: %s programa [arg ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "Error de b�squeda"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: can't exec %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "Error al cambiar el modo de %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: no se puede encontrar el proceso \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: can't exec %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "No se puede asignar el b�fer.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "bad timeout value: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Hay demasiados argumentos.\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "No se puede asignar el b�fer.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "bad speed: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "too many alternate speeds"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: no se puede abrir como entrada est�ndar: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: no es un dispositivo de caracteres"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: no abierto para lectura/escritura"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema de dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "tipo: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: lectura: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: desbordamiento de entrada"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12650,69 +12789,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "usuario"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "usuarios"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "Error de b�squeda"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Siguiente fichero: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "es y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "es n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "sem�foros asignados = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "identificador inv�lido: %s\n"
@@ -12728,52 +12861,46 @@ msgstr ""
 "Utilice `%s [opciones] %s' si quiere utilizarlo de verdad.\n"
 "No se inicia la transcripci�n.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "No se puede abrir el fichero '%s'"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado; el fichero es %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado (%s)"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: no se puede encontrar \"_stext\" en %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12782,79 +12909,76 @@ msgstr ""
 "\n"
 "Script terminado (%s)"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminado; el fichero es %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty ha fallado\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "No quedan pty\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "se esperaba un n�mero, pero se obtuvo '%s'"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "fall� la escritura a stdout"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() no ha podido leer la hora de %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "se esperaba un n�mero, pero se obtuvo '%s'"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "No se puede abrir el fichero '%s'"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() no ha podido leer la hora de %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr ""
@@ -12865,111 +12989,108 @@ msgid "Argument error."
 msgstr "%s: error de argumento, uso\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "Se ha cambiado la informaci�n de finger.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "No se puede bifurcar (fork)"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "No se puede bifurcar (fork)"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "No se puede abrir %s %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "No se puede (des)activar el modo de ahorro de alimentaci�n\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "No se puede abrir el dispositivo %s para escribir\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "Error de klogctl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Error al escribir vuelco de pantalla\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "No se ha podido abrir %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM no est� definido.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: se�al desconocida %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12997,143 +13118,145 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Uso: %s [opciones] dispositivo ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "identificador inv�lido"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "bad timeout value: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: no se puede abrir el fichero temporal.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: no se puede establecer la velocidad: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "No se puede obtener el tama�o del disco"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Mensaje de difusi�n general (broadcast) de %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: no se puede leer %s - use la entrada est�ndar.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "El estado de %s es %d"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Siguiente fichero: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "uso: namei [-mx] nombreruta [nombreruta ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: no se puede encontrar el nombre de tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: tiene el permiso de escritura desactivado.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s no tiene una sesi�n iniciada en %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s tiene los mensajes desactivados en %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s no tiene iniciada una sesi�n\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s tiene los mensajes desactivados\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr ""
 "write: %s tiene iniciada una sesi�n m�s de una vez; escribiendo en %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "L�nea de entrada demasiado larga.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Mensaje de %s@%s (como %s) en %s a las %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Mensaje de %s@%s el %s a las %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "La asignaci�n de memoria (malloc) ha fallado"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13312,7 +13435,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13517,7 +13640,7 @@ msgstr ""
 "\n"
 "Patr�n no encontrado\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Patr�n no encontrado"
 
@@ -13584,7 +13707,7 @@ msgstr "hexdump: formato incorrecto {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: car�cter de conversi�n %%%s incorrecto.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13612,89 +13735,89 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Uso: %s [-n�mero] [-p cadena] [-cefrns] [+l�nea] [+/patr�n/] [ficheros]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: la opci�n necesita un argumento -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opci�n ilegal -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...saltando hacia adelante\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...saltando hacia atr�s\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "No hay ning�n fichero siguiente"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "No hay ning�n fichero anterior"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Error de lectura en el fichero %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF inesperado en el fichero %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Error desconocido en el fichero %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: No se puede crear un fichero temporal.\n"
 
 # �Qu� significa?
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE error:"
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "No se recuerda ninguna cadena de b�squeda"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "No se puede abrir "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "guardado"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": no se permite !orden en el modo rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fall� la llamada al sistema fork(), int�ntelo de nuevo m�s adelante\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Siguiente fichero: "
 
@@ -13762,8 +13885,8 @@ msgstr "Uso: %s [opciones] dispositivo ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13779,39 +13902,108 @@ msgstr "%s: fallo al abrir %s\n"
 msgid "no input file specified"
 msgstr "No se ha especificado la opci�n --date.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Uso: %s [opciones] dispositivo ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "Problemas al leer terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Secuencia de escape desconocida en entrada: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "L�nea de entrada demasiado larga.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Uso:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Error al cerrar el fichero\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "S�lo puede cambiar la etiqueta de las particiones no vac�as.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Atenci�n: la partici�n %s "
+
+#~ msgid "is not contained in partition %s\n"
+#~ msgstr "no se encuentra dentro de la partici�n %s\n"
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Atenci�n: las particiones %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "y %s se solapan\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "dispositivo: similar a /dev/hda or /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "bytes"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uso: %s [opciones] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Uso: %s [opciones] dispositivo ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13965,28 +14157,10 @@ msgstr "L�nea de entrada demasiado larga.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [o --help]:       Imprime este mensaje"
 
-#~ msgid "dangerous options:"
-#~ msgstr "opciones peligrosas:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [o --show-geometry]:  Imprime la idea del n�cleo sobre la geometr�a"
 
-#, fuzzy
-#~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -g [o --show-geometry]:  Imprime la idea del n�cleo sobre la geometr�a"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [o --show-extended]:  Muestra tambi�n las particiones extendidas "
-#~ "en\n"
-#~ "                             salida o espera sus descriptores en entrada"
-
 #~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
@@ -14055,58 +14229,9 @@ msgstr "L�nea de entrada demasiado larga.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [opciones] [--] cadenaopciones par�metros\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [opciones] -o|--options cadenaopciones [opciones] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              par�metros\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Permite opciones largas con un solo - "
-#~ "inicial\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Esta peque�a gu�a de uso\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=opclargas  Opciones largas para reconocer\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=nombreprograma    El nombre con el que se informa de los "
-#~ "errores\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=cadenaopciones Opciones cortas que se reconocen\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Desactiva informaci�n de errores mediante\n"
-#~ "                               getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           No hay salida normal\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=int�rpr.�rdenes  Define las convenciones de cita del "
-#~ "int�rprete\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr ""
-#~ "  -T, --test                   Prueba para la versi�n de getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unquote                No entrecomilla el resultado\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Muestra informaci�n de versi�n\n"
-
 # FIXME: �Qu� hace un n�mero de versi�n en una cadena para ser traducida?
 #, fuzzy
 #~ msgid "getopt (enhanced) 1.1.4\n"
@@ -15628,9 +15753,6 @@ msgstr "L�nea de entrada demasiado larga.\n"
 #~ "Reinicie el sistema para asegurarse de que la tabla de particiones se "
 #~ "actualice.\n"
 
-#~ msgid "Warning: partition %s contains part of "
-#~ msgstr "Atenci�n: la partici�n %s contiene parte de "
-
 #~ msgid "and will destroy it when filled\n"
 #~ msgstr "y la destruir� al rellenarla\n"
 
diff --git a/po/et.po b/po/et.po
index 3aa0b6b0c..d21c7cf1c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11r\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2002-05-19 20:04GMT+0300\n"
 "Last-Translator: Meelis Roos <mroos@linux.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -108,29 +108,29 @@ msgstr ""
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, fuzzy, c-format
 msgid "%s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "ei suuda avada seadet %s"
@@ -209,7 +209,7 @@ msgid "Verifying ... "
 msgstr "Kontrollin ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Ei suuda avada faili `%s'"
@@ -249,15 +249,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -270,7 +270,7 @@ msgstr "%s paketist %s\n"
 msgid "cannot stat file %s"
 msgstr "stat(%s) ei �nnestunud"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -314,8 +314,8 @@ msgid "stat failed: %s"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "Ei suuda avada faili `%s'"
@@ -542,55 +542,55 @@ msgstr ""
 msgid "compiled without -x support"
 msgstr "%s pole kompileeritud minix v2 toega\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Kasutamine: %s [-larvsmf] /dev/seade\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s on monteeritud. "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Kas Te soovite t�esti j�tkata"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "katkestan kontrolli\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Tsooni nr. < FIRSTZONE failis `%s'"
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Tsooni nr. >= ZONES failis `%s'"
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Kas eemaldada plokk"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Viga lugemisel: ei suuda seekida plokile failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Viga lugemisel: vigane plokk failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -599,296 +599,296 @@ msgstr ""
 "Sisemine viga: katse kirjutada vigasesse plokki\n"
 "Kirjutamise katset ignoreeriti\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "seek ei �nnestunud ploki kirjutamisel"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Viga kirjutamisel: vigane plokk failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "seek ei �nnestunud superploki kirjutamisel"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "ei suuda kirjutada superplokki"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "ei suuda kirjutada i-kirjete kaarti"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "ei suuda kirjutada tsoonide kaarti"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "ei suuda kirjutada i-kirjeid"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "seek ei �nnestunud"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "ei suuda lugeda superplokki"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "vigane maagiline number superplokis"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Ainult 1k plokid ja tsoonid on toetatud"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "vigane s_imap_blocks v�li superplokis"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "vigane s_zmap_blocks v�li superplokis"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "ei j�tku m�lu i-kirjete kaardile"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "ei j�tku m�lu i-kirjete kaardile"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "ei j�tku m�lu i-kirjete puhvrile"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "ei j�tku m�lu i-kirjete loendurile"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "ei j�tku m�lu tsoonide loendurile"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "ei suuda lugeda i-kirjete kaarti"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "ei suuda lugeda tsoonide kaarti"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "ei suuda lugeda i-kirjeid"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Hoiatus: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld i-kirjet\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld plokki\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Esimene andmete tsoon=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tsooni suurus=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Max. suurus=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Failis�steemi olek=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "nime pikkus=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "I-kirje %d on m�rgitud mittekasutatuks, aga kasutatud failis `%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "M�rkida kasutatuks"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Fail `%s' on moodiga %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Hoiatus: i-kirjete arv on liiga suur\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "juurkataloogi i-kirje ei kirjelda kataloogi"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Plokk on juba kasutatud, kuid leidus uuesti failis `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Kas puhastada"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Plokk %d failis `%s' on m�rgitud mittekasutatuks."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Kas parandada"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Kataloog `%s' sisaldab vigast i-kirje numbrit failile `%.*s'"
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Kas eemaldada"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "`%s': vigane kataloog: `.' pole esimene\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "`%s': vigane kataloog: `..' pole teine\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "sisemine viga"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "`%s': vigane kataloog: suurus < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "seek ei �nnestunud funktsioonis bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "I-kirje %d moodi ei puhastatud."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "I-kirje %d pole kasutusel, m�rgitud kasutatuks bitmapis."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "I-kirje %d on kasutusel, m�rgitud mittekasutatuks bitmapis."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Seada bitt bitmapis"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-kirje %d (mood = %07o), i_nlinks=%d, loendatud=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Seada i_nlinks loendatud arvuks"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Tsoon %d; m�rgitud kasutatuks, kuid �kski fail ei kasuta seda."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "M�rkida mittekasutatuks"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Tsoon %d: kasutusel, loendatud=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Tsoon %d: kasutusel, loendatud=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "vigane i-kirje suurus"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "vigane v2 i-kirje suurus"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "interaktiivseks parandamiseks on vaja terminali"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "ei suuda avada seadet %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s on puhas ega vaja kontrolli\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Pealesunnitud kontroll failis�steemil %s\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Failis�steem %s on \"must\" ja vajab kontrolli\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -897,12 +897,12 @@ msgstr ""
 "\n"
 "%6ld i-kirjet kasutusel (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld tsooni kasutusel (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -925,7 +925,7 @@ msgstr ""
 "------\n"
 "%6d faili\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1049,7 +1049,7 @@ msgstr "liiga palju i-kirjeid - maksimum on 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "pole piisavalt vaba ruumi, vaja oleks v�hemalt %lu plokki"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Seade: %s\n"
@@ -1199,8 +1199,8 @@ msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr "Viga %s sulgemisel\n"
+msgid "cannot close file %s"
+msgstr "Ei suuda avada faili `%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1302,88 +1302,98 @@ msgid ""
 "that some device files will be wrong."
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Kasutamine: %s [-c | -l failinimi] [-nXX] [-iXX] /dev/nimi [plokke]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s on monteeritud - siia failis�steemi ei tee!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "boot-plokki seekimine tabelite kirjutamisel ei �nnestunud"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "ei suuda puhastada boot-sektorit"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "seek ei �nnestunud tabelite kirjutamisel"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "ei suuda kirjutada superplokki"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "ei suuda kirjutada i-kirjete kaarti"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "ei suuda kirjutada tsoonide kaarti"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "ei suuda kirjutada i-kirjeid"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "seek ei �nnestunud ploki kirjutamisel"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "ploki kirjutamine ei �nnestunud"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "liiga palju vigaseid plokke"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "liiga v�he korras plokke"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "ei j�tku m�lu i-kirjete puhvrile"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld i-kirjet\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld plokki\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1392,97 +1402,97 @@ msgstr ""
 "Max. suurus=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "seek ei �nnestunud plokkide testimisel"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Imelikud v��rtused funktsioonis do_check - ilmselt bugid\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "seek ei �nnestunud plokkide kontrollimisel"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "vigased plokid enne andmepiirkonda - ei suuda failis�steemi tekitada"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d vigast plokki\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "�ks vigane plokk\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "ei suuda vigaste plokkide faili avada"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "Ei suuda kettalt lugeda"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "vigane i-kirje suurus"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol viga: plokkide arvu pole antud"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "seek ei �nnestunud"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "seek ei �nnestunud"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, c-format
 msgid "%s: device is misaligned"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "ei �rita luua failis�steemi seadmele `%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Sisetage sektorite arv"
@@ -1816,7 +1826,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "seek ei �nnestunud tabelite kirjutamisel"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2157,7 +2167,7 @@ msgid "   Logical"
 msgstr " Loogiline"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -2824,12 +2834,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD partitsioonitabeli k�sk (m annab abiinfot): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Esimene %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimane %s v�i +suurus v�i +suurusM v�i +suurusK"
@@ -2977,7 +2987,7 @@ msgid "tracks/cylinder"
 msgstr "rada silindris"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "silindrit"
 
@@ -3044,12 +3054,12 @@ msgstr "Maksimaalne arv partitsioone on juba loodud\n"
 msgid "This partition already exists.\n"
 msgstr "See partitsioon on juba olemas\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Hoiatus: liiga palju partitsioone (%d, maksimum on %d)\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3253,7 +3263,7 @@ msgstr "Te peate m��rama, et eksisteerib nii-ja-nii-mitu"
 msgid "heads"
 msgstr "pead"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektorit"
 
@@ -3677,7 +3687,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    Algus       L�pp   Plokke   Id  S�steem\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Seade"
 
@@ -3761,7 +3771,7 @@ msgstr "Kogu kasutataud sektorite arv %d on suurem kui sektorite koguarv %d\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%d vaba sektorit\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partitsioon %d on juba olemas. Kustutage see enne uuesti lisamist\n"
@@ -3918,37 +3928,37 @@ msgstr "Viga %s sulgemisel\n"
 msgid "Syncing disks.\n"
 msgstr "Kirjutan puhvreid kettale\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitsioonil %d pole andmetele ruumi eraldatud\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Andmete uus algus"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Eksperdi k�sk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Sisestage silindrite arv"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Sisetage peade arv"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Sisetage sektorite arv"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Hoiatus: sean sektorite offseti DOSiga �hilduvuse jaoks\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3957,32 +3967,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Seade %s ei sisalda �ratuntavat partitsioonitabelit\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "Ei suuda avada faili %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tundmatu k�sk\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Kasutatav tuum leiab sektori suuruse ise - ignoreerin -b v�tit\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -3991,18 +4001,18 @@ msgstr ""
 "Hoiatus: -b v�tit (sektori suuruse seadmine) tuleks kasutada ainult �he "
 "t�pselt m��ratud seadmega\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Leidisn seadmelt %s OSF/1 partitsioonitabeli, l�hen OSF/1 rezhiimi.\n"
 "DOSi partitsioonitabeli rezhiimi naasmiseks kasutage k�sku `r'.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "K�sk (m annab abiinfot): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4011,16 +4021,16 @@ msgstr ""
 "\n"
 "Aktiivne buutfail on %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Palun sisestage uue buutfaili nimi: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Buutfail j�i samaks\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4342,9 +4352,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tTe olete valinud ebahariliku buutfaili nime\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "T��pi saab muuta ainult mittet�hjadel partitsioonidel\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Kahjuks saba ainult root s�steemikelal keerata\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4360,7 +4370,7 @@ msgstr ""
 "terve ketta kirje tohib seda reeglit rikkuda.\n"
 "Kui olete kindel, et soovite seda t��pi muuta, kirjutage YES\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4556,7 +4566,7 @@ msgstr "Kasutamata vahemik - sektorid 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kasutamata vahemik - sektorid %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4565,7 +4575,7 @@ msgstr ""
 "Teised partitsioonid katavad juba kogu ketta.\n"
 "Kustutage v�i v�hendage neist m�nda ja proovige uuesti\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4574,12 +4584,12 @@ msgstr ""
 "On �limalt soovitav, et 11. partitsioon kataks kogu ketta\n"
 "ja oleks t��pi \"SGI volume\"\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4589,7 +4599,7 @@ msgstr ""
 "Kolmas partitsioon ei kata kogu ketast, aga sisesatud v��rtus %d %s\n"
 "katab mingi muu partitsiooni. Sisestatud kirje uueks v��rtuseks on %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4598,7 +4608,7 @@ msgstr ""
 "Kui soovite hoida �hilduvust SunOS'i/Solarisega, j�tke see partitsioon\n"
 "kogu ketast katma (5), alguseks 0, pikkuseks %u sektorit\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4612,7 +4622,7 @@ msgstr ""
 "sisestage YES, kui olete t�desti kindlad, et tahate partitsiooni t��biks\n"
 "panna 82 (Linuxi saalimisala):"
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4632,7 +4642,7 @@ msgstr ""
 "�hikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4645,28 +4655,28 @@ msgstr ""
 "�hikud = %s suurusega %d * 512 baiti\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lipp    Algus       L�pp   Plokke   ID  S�steem\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Alternatiivsete silindrite arv"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Lisasektoreid silindril"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Vahelej�tu tegur"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "P��rlemiskiirus (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "F��siliste silindrite arv"
 
@@ -5135,7 +5145,7 @@ msgstr "Ketas %s: ei suuda geomeetriat kindlaks teha\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Ketas %s: ei suuda mahtu kindlaks teha\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5146,22 +5156,22 @@ msgstr ""
 "terve ketas. fdiski kasutamine on ilmselt m�ttetu.\n"
 "Kasutage --force v�tit, kui t�esti tahate seda teha.\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Hoiatus: HDIO_GETGEO �tles, et seadmel on %lu pead\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Hoiatus: HDIO_GETGEO �tles, et seadmel on %lu sektorit\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Hoiatus: BLKGETSIZE/HDIO_GETGEO �tles, et seadmel on %lu silindrit\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5171,7 +5181,7 @@ msgstr ""
 "See tekitab probleeme k�igi programmidega, mis �ritavad kasutada\n"
 "C/H/S (silinder/pea/sektor) adresseerimist.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5180,14 +5190,14 @@ msgstr ""
 "\n"
 "Ketas %s: %lu silindrit, %lu pead, %lu sektorit rajal\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s partitsioonil %s sisaldab vigast pead numbrit: %lu (peaks olema 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5196,7 +5206,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast sektori v��rtust: %lu (peaks olema 1-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5205,7 +5215,7 @@ msgstr ""
 "%s partitsioonil %s sisaldab vigast silindri v��rtust: %lu (peaks olema 0-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5214,12 +5224,12 @@ msgstr ""
 "ID  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Loen uuesti partitsioonitabelit...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5229,26 +5239,26 @@ msgstr ""
 "Partitsioonitabeli �lelugemine ei �nnestunud\n"
 "Tehke arvutile kohe alglaadimine, enne mkfs kasutamist\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Viga %s sulgemisel\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: sellist partitsiooni ei ole\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "Tundmatu formaat - kasutan sektoreid\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "Seda formaati pole veel realiseeritud - kasutan %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5257,12 +5267,12 @@ msgstr ""
 "�hikud = silindrid %lu baidiga, plokid 1024 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus     L�pp   #sil     #plokke   ID  S�steem\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5271,12 +5281,12 @@ msgstr ""
 "�hikud = sektorid 512 baidiga, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Seade  Buut    Algus      L�pp   #sektors  ID  S�steem\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5285,12 +5295,12 @@ msgstr ""
 "�hikud = 1024-baidised plokid, loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Seade  Buut   Algus      L�pp    #plokke   ID  S�steem\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5299,31 +5309,31 @@ msgstr ""
 "�hikud = megabaidid (1048576 baiti), plokid (1024 baiti), loendan alates %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Seade  Buut Algus   L�pp    MB    #plokke   ID  S�steem\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\talgus: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tl�pp: (c,h,s) ootasin (%ld,%ld,%ld), sain (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "Partitsioon l�peb silindril %ld, tagapool ketta l�ppu\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Ei leidnud �htegi partitsiooni\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5334,51 +5344,41 @@ msgstr ""
 "C/H/S=*/%ld/%ld jaoks (mitte %ld/%ld/%ld).\n"
 "Eeldan seda geomeetriat nimekirja n�itamisel.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Imelik, ainult  %d partitsiooni on defineeriud\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, aga pole m�rgitud t�hjaks\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid on m�rgitud buutivaks\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Hoiatus: partitsioon %s on suurusega 0, kuid algus pole 0\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Hoiatus: partitsioon %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "ei sisaldu partitsioonis %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Hoiatus: partitsioonid %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "ja %s kattuvad\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Hoiatus: partitsioon %d on t�hi\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5387,17 +5387,17 @@ msgstr ""
 "Hoiatus: partitsioon %s sisaldab osa partitsioonitabelist (sektor %lu)\n"
 "ja h�vitab selle, kui ta andmetega t�idetakse\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Hoiatus: partitsioon %s algab sektorilt 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Hoiatus: partitsioon %s s�idab �le ketta otsa\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5405,17 +5405,17 @@ msgstr ""
 "Ainult �ks primaarsetest partitsioonidest tohib olla extended\n"
 "(kuigi see pole Linuxis probleemiks)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei alga silindri piirilt\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Hoiatus: partitsioon %s ei l�ppe silindri piiril\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5425,7 +5425,7 @@ msgstr ""
 "LILO jaoks pole see oluline, aga DOS-i MBR v�ib buutimisel raskustesse "
 "sattuda.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5433,7 +5433,7 @@ msgstr ""
 "Hoiatus: harilikult saab buutida ainult primaarsetelt partitsioonidelt,\n"
 "ainult LILO ignoreerib buuditavuse lippu.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5441,39 +5441,39 @@ msgstr ""
 "Hoiatus: �kski primaarne partitsioon pole m�rgitud buutivaks (aktiivseks).\n"
 "See pole LILO jaoks oluline, aga DOS-i MBR ei suuda siit kettalt buutida.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 #, fuzzy
 msgid "end"
 msgstr "End"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5481,230 +5481,305 @@ msgstr ""
 "Hoiatus: extended partitsioon ei alga silindri piirilt.\n"
 "DOS ja Linux interpreteerivad selle sisu erinevalt.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Hoiatus: t�hi partitsioon\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "Liiga palju partitsioone\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+msgstr "kasutamine:\n"
 
-#: fdisk/sfdisk.c:2355
-#, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr ""
+#: fdisk/sfdisk.c:2332
+#, fuzzy, c-format
+msgid " %s [options] <device> [...]\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d partitsiooni:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2364
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "kasutamine:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5713,62 +5788,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "kokku: %d plokki\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ei suuda avada seadet %s lugemiseks ja kirjutamiseks\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ei suuda avada seadet %s lugemiseks\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5776,42 +5851,42 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fataalne viga: ei suuda leida %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Hoiatus: %s pole plokkseade\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5819,73 +5894,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Palun sisestage y, n v�i q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5914,101 +5989,102 @@ msgstr "Kirjutan puhvreid kettale\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+msgid "succeeded"
 msgstr ""
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "seek ei �nnestunud"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "shutdown: Ei suuda lahti monteerida kataloogi %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "%s: sisendi �let�itumine"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr ""
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Pealesunnitud kontroll failis�steemil %s\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6016,58 +6092,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s pole flopiseade\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Ei suutnud avada %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s on monteeritud. "
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Monteerin lahti k�ik allesj��nud failis�steemid"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Monteerin lahti k�ik allesj��nud failis�steemid"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: Tundmatu argument: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6084,33 +6160,66 @@ msgstr ""
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt/getopt.c:314
+#: getopt/getopt.c:317
 #, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+
+#: getopt/getopt.c:323
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+
+#: getopt/getopt.c:324
+msgid " -h, --help                   This small usage guide\n"
+msgstr ""
+
+#: getopt/getopt.c:325
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:326
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+
+#: getopt/getopt.c:327
+msgid " -o, --options <optstring>    Short options to be recognized\n"
 msgstr ""
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "                s - Sektorite j�rgi j�rjestatud tabel"
+
+#: getopt/getopt.c:329
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr ""
+
+#: getopt/getopt.c:330
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+
+#: getopt/getopt.c:331
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr ""
+
+#: getopt/getopt.c:332
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr ""
+
+#: getopt/getopt.c:333
+msgid " -V, --version                Output version information\n"
+msgstr ""
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr ""
 
@@ -6571,99 +6680,117 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Epohhi v��rtuse seadmine ei �nnestunud\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d partitsiooni:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                �tleb hwclock'ile, mis t��pi Alphaga on tegemist\n"
 "                Vt. hwclock(8) l�hema info jaoks\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "S�steemikella seadmine ei �nnestunud\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ei taha mitte-v�tmelisi argumente. %d on �leliigne\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time."
 msgstr "Korraga saab kasutada ainult �hte funktsiooni\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6672,53 +6799,53 @@ msgstr ""
 "%s: --utc ja --localtime v�tmed on teineteist v�listavad. Teie kasutasite "
 "m�lemat korraga\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr "%s: V�tmed --adjust ja --noadjfile on vastastikku v�listavad\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr "%s: V�tmed --adjust ja --noadjfile on vastastikku v�listavad\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: Koos v�tmega --noadjfile tuleb anda ka kas --utc v�i --localtime v�ti\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Ei saanud kasutatavat aega, ei keera kella\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Kahjuks saab ainult root riistvaralist kella keerata\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Kahjuks saba ainult root s�steemikelal keerata\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr "Kahjuks saab ainult root riistvaralise kella epohhi seada\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "Ei suuda �hegi tuntud meetodiga riistvaralist kella k�tte saada\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -6897,7 +7024,7 @@ msgid "failed to read mtab"
 msgstr "ei suuda stat'ida seadet %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "ei j�tku m�lu kaartide puhvritele"
@@ -6939,71 +7066,111 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr ""
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "ei j�tku m�lu kaartide puhvritele"
@@ -7089,7 +7256,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: PAM viga, katkestan: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Parool: "
 
@@ -7528,47 +7695,48 @@ msgstr "TOHUTULT reavahetusi"
 msgid "too many bare linefeeds."
 msgstr "Liiga palju t�hje ridu\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Login timed out after %d seconds\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Viimati loginud: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "masinast %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "terminalil %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "%s avamine ei �nnestunud"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN FAILURE FROM %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN FAILURE ON %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN FAILURES FROM %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN FAILURES ON %s, %s"
@@ -7598,7 +7766,7 @@ msgstr "identifikaatorile pole �igusi"
 msgid "setuid failed"
 msgstr "setuid() ei �nnestunud"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "exec ei �nnestunud\n"
@@ -7645,8 +7813,8 @@ msgstr ""
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "fork ei �nnestunud\n"
@@ -7699,24 +7867,21 @@ msgstr "Vigane aasta number, lubatud on 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Kasutamine: cal [-13smjyV] [[kuu] aasta]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7825,32 +7990,32 @@ msgstr " Kas eemaldada"
 msgid "failed to add line to output"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "positsioneerimise viga"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: ei suuda lugeda %s\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "M�lu sai otsa"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7861,91 +8026,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Kataloogi %s pole!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "ei j�tku m�lu kaartide puhvritele"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "ei j�tku m�lu kaartide puhvritele"
@@ -7970,12 +8160,12 @@ msgstr "%s: ei leia protsessi \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: tundmatu signaal %s, tuntud signaalid:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Kasutamine: %s [ -s signaal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "             %s -l [ signaal ]\n"
@@ -7995,83 +8185,82 @@ msgstr "Ploki suurus: %d\n"
 msgid "connect %s"
 msgstr ""
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "Ploki suurus: %d\n"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr ""
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, c-format
 msgid "file %s"
 msgstr ""
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "arv `%s' v�tmele `%s' on v�ljaspool lubatud vahemikku\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: tundmatu kategooria nimi: %s\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: tundmatu prioriteedi nimi: %s\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8207,7 +8396,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8225,12 +8414,13 @@ msgstr "%s: Avamine ei �nnestunud: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8238,7 +8428,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8261,40 +8451,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Ei suutnud avada %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Sain %d baiti %s seest\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "exec ei �nnestunud\n"
@@ -8314,24 +8504,12 @@ msgstr "stat(%s) ei �nnestunud"
 msgid "%s - No such file or directory\n"
 msgstr "juurkataloogi i-kirje ei kirjelda kataloogi"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d partitsiooni:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8343,19 +8521,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date argument on liiga pikk\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8365,170 +8542,168 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: %s �mber nimetamine %s -ks ei �nnestnud: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "%s: Tundmatu argument: %s\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "salvesta (W)"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "lugesin %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
 # XXX stat'ida
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "ei suuda stat'ida seadet %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Ei suutnud avada %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Ei suutnud avada %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "vigane identifikaator"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "vigane identifikaator"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: lugemise viga failis %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8536,29 +8711,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8593,42 +8767,43 @@ msgstr "seek ei �nnestunud"
 
 #: misc-utils/wipefs.c:240
 #, c-format
-msgid "%zd bytes ["
-msgstr ""
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr ""
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8718,118 +8893,116 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: Kasutajat \"%s\" pole olemas\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "stat(%s) ei �nnestunud"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s pole flopiseade\n"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%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/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor%d on juba kasutusel\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8837,51 +9010,48 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "Seade: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9394,162 +9564,165 @@ msgstr ""
 msgid "not enough memory"
 msgstr ""
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "exec ei �nnestunud\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ei �nnestunud"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "%s avamine ei �nnestunud"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Nimi"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "stat(%s) ei �nnestunud"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr ""
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "seek ei �nnestunud"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9820,7 +9993,7 @@ msgstr "Hoiatus: kustutan partitsioonid p�rast %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "Hoiatus: kustutan partitsioonid p�rast %d\n"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -9880,19 +10053,13 @@ msgstr "   p   n�idata BSD partitsioonitabelit"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Seade %s ei sisalda �ratuntavat partitsioonitabelit\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -9903,47 +10070,45 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, c-format
+#: partx/partx.c:601
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr ""
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "ei j�tku m�lu kaartide puhvritele"
@@ -10070,7 +10235,7 @@ msgstr "%s: Avamine ei �nnestunud: %s\n"
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
@@ -10332,7 +10497,7 @@ msgstr ""
 msgid "Can't set signal handler"
 msgstr ""
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr ""
 
@@ -10341,24 +10506,24 @@ msgstr ""
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr ""
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr ""
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
@@ -10449,123 +10614,106 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Tundmatu argument: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Kataloogi %s pole!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync ei �nnestunud"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "%s avamine ei �nnestunud"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 msgid "unsupported command"
 msgstr ""
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync ei �nnestunud"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10573,40 +10721,40 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Liiga palju argumente\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "--date parameeter on puudu\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr ""
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "seek ei �nnestunud"
@@ -10614,100 +10762,100 @@ msgstr "seek ei �nnestunud"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "v�ti `%s' vajab argumenti\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: Ei suuda avada faili %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: lugemise viga failis %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "fork ei �nnestunud\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "--date parameeter on puudu\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "--date parameeter on puudu\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "seek ei �nnestunud"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "juurkataloogi i-kirje ei kirjelda kataloogi"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "seek ei �nnestunud"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "seek ei �nnestunud"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10716,96 +10864,87 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "--date parameeter on puudu\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "juurkataloogi i-kirje ei kirjelda kataloogi"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "seek ei �nnestunud"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
-msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11294,7 +11433,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:621
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:623
@@ -11304,7 +11443,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:625
 #, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:628
@@ -11336,7 +11475,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:647
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:649
@@ -11368,7 +11507,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:680
 #, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:682
@@ -11416,71 +11555,69 @@ msgstr ""
 msgid "invalid iflag: %s"
 msgstr "vigane kiirus: %s"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "vigane kiirus: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s paketist %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "vigane identifikaator"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "vigane arv: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s pole plokkseade"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ei suuda kettal seekida"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ei suuda kindlaks teha seadme %s mahtu"
@@ -11634,48 +11771,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "juurkataloogi i-kirje ei kirjelda kataloogi"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s on monteeritud. "
@@ -11698,55 +11830,50 @@ msgid ""
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr ""
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11755,238 +11882,229 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s paketist %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Tundmatu argument: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "vigane taimadi v��rtus: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "kasutaja"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "settimeofday() ei �nnestunud"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestnud\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "Viga %s sulgemisel\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "seek ei �nnestunud"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "vigane kiirus: %s"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "settimeofday() ei �nnestunud"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Kasutan %s\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Kasutan %s\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s pole flopiseade\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "vigane kiirus: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12037,17 +12155,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "Partitsioonitabelit ei ole\n"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "Liiga palju argumente\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr ""
@@ -12128,173 +12246,171 @@ msgstr ""
 msgid "%s using polling\n"
 msgstr ""
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "seek ei �nnestunud"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "fork ei �nnestunud"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "fork ei �nnestunud"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: ei suuda k�ivitada programmi %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "Viga sektori %lu kirjutamisel seadmele %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: ei leia protsessi \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: ei suuda k�ivitada programmi %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "ei j�tku m�lu kaartide puhvritele"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "vigane taimadi v��rtus: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Liiga palju argumente\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "ei j�tku m�lu kaartide puhvritele"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "vigane kiirus: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "liiga palju alternatiivseid kiirusi"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "ei saanud avada /dev/%s standardsisendina: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s pole s�mbolseade"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s pole avatud lugemiseks _ja_ kirjutamiseks"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "probleem %s dubleerimisel: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "t��p: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: read: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: sisendi �let�itumine"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12306,69 +12422,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "kasutaja"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "kasutajat"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "seek ei �nnestunud"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "%s: Avamine ei �nnestunud: %s\n"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "on sisse l�litatud (y)\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "on v�lja l�litatud (n)\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "seek ei �nnestunud"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "vigane kiirus: %s"
@@ -12381,132 +12491,123 @@ msgid ""
 "Program not started."
 msgstr ""
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "Ei suuda avada faili `%s'"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "stat(%s) ei �nnestunud"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "Ei suuda avada faili `%s'"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "M�lu sai otsa"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "%s avamine ei �nnestunud"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "Liiga palju argumente\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "Ei suuda avada faili `%s'"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() abil kella lugemine %s kaudu ei �nnestunud"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr ""
@@ -12517,110 +12618,107 @@ msgid "Argument error."
 msgstr "Kirjutamise viga seadmel %s\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "Kasutaja informatsioon on muudetud\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "fork ei �nnestunud"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "fork ei �nnestunud"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "Ei suuda avada faili %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "fork ei �nnestunud"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "ei suuda avada seadet %s kirjutamiseks\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "Fataalne viga\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "viga i-kirje kirjutamisel"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Ei suutnud avada %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 msgid "$TERM is not defined."
 msgstr ""
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: tundmatu signaal %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12648,144 +12746,146 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "vigane identifikaator"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "vigane taimadi v��rtus: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: ei suuda avada ajutist faili\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "fork ei �nnestunud"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Ei suuda kindlaks teha ketta mahtu"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Teade k�igile kasutajalt %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: ei hakka %s lugema, kasuta standardsisendit\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "seek ei �nnestunud"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "vigane kiirus: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: ei leia Sinu terminaliseadme nime\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: Sul on kirjutamis�igus v�lja l�litatud\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s pole terminalilt %s sisse logitud\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s keeldub teadetest terminalil %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s pole sisse logitud\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s keeldub teadetest\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr ""
 "write: %s on sisse logitud rohkem kui �hest kohast, kasutan tema terminali "
 "%s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "k�ite nimi on liiga pikk"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Teade kasutajalt %s@%s (%s) terminalil %s kell %s..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Teade kasutajalt %s@%s terminalil %s kell %s..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "M�lu sai otsa"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -12963,7 +13063,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13128,7 +13228,7 @@ msgid ""
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr ""
 
@@ -13191,7 +13291,7 @@ msgstr ""
 msgid "bad conversion character %%%s"
 msgstr ""
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13219,91 +13319,91 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "v�ti `%s' vajab argumenti\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: vigane v�ti (%s)\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 #, fuzzy
 msgid "No previous file"
 msgstr "�htegi partitsiooni pole defineeritud\n"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: lugemise viga failis %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: seekimise viga failis %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ei suuda lugeda ajutist faili\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 #, fuzzy
 msgid "RE error: "
 msgstr "positsioneerimise viga"
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 #, fuzzy
 msgid "Cannot open "
 msgstr "Ei suuda avada seadmefaili %s\n"
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "Parooli EI muudetud - proovige hiljem uuesti\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr ""
 
@@ -13371,8 +13471,8 @@ msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13388,39 +13488,95 @@ msgstr "%s: Avamine ei �nnestunud: %s\n"
 msgid "no input file specified"
 msgstr "--date parameeter on puudu\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr ""
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr ""
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "k�ite nimi on liiga pikk"
 
-#~ msgid "Usage:\n"
-#~ msgstr "kasutamine:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr "Viga %s sulgemisel\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "T��pi saab muuta ainult mittet�hjadel partitsioonidel\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Hoiatus: partitsioon %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Hoiatus: partitsioonid %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "ja %s kattuvad\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Kasutamine: %s [ v�tmed ] seade ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
diff --git a/po/eu.po b/po/eu.po
index a13c7a125..58d32cfbd 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-02-16 19:58+0100\n"
 "Last-Translator: Mikel Olasagasti Uranga <hey_neken@mundurat.net>\n"
 "Language-Team: Basque <translation-team-eu@lists.sourceforge.net>\n"
@@ -107,29 +107,29 @@ msgstr "berirakurri partizio taula"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "lortu tamainua 512 byte-eko sektoreetan"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "ezin da %s ireki"
@@ -208,7 +208,7 @@ msgid "Verifying ... "
 msgstr "Egiaztatzen ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Ezin da '%s' fitxategia ireki"
@@ -246,15 +246,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -267,7 +267,7 @@ msgstr "%s-(e)tik renice-ea\n"
 msgid "cannot stat file %s"
 msgstr "Ezin da '%s' (%s) raw moetako gailua aurkitu\n"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -311,8 +311,8 @@ msgid "stat failed: %s"
 msgstr "stat-ek huts egin du: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "open-ek huts egin du: %s"
@@ -537,365 +537,365 @@ msgstr ""
 msgid "compiled without -x support"
 msgstr "        (libblkid gabe konpilatua). "
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Erabilera: %s [-larvsmf] /dev/izena\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s montatua dago.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 #, fuzzy
 msgid "Remove block"
 msgstr "ezin da %s id-a ezabatu (%s)\n"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 #, fuzzy
 msgid "Unable to write inodes"
 msgstr "   w   idatzi diskoaren etiketa diskoan"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "seek-ek huts egin du"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 #, fuzzy
 msgid "Unable to read inodes"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, fuzzy, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Oharra: inodo kopurua handiegia.\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodo\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld bloke\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Lehen data zona=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonaren tamainua=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Gehienezko tamainua=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Fitxategi sistemaren egoera=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "izen luzeera=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Markatu erabilia dagoela"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "`%s' fitxategiak %05o modua dauka\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Oharra: inodo kopurua handiegia.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "erro inodoa ez da direktorioa"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Garbia"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Zuzena"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Ezabatu"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, fuzzy, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "erro inodoa ez da direktorioa"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, fuzzy, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "erro inodoa ez da direktorioa"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "barne errorea"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
 #, c-format
-msgid "Inode %d mode not cleared."
+msgid "Inode %lu mode not cleared."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
 #, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
 #, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Ezarri"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
 #, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
 #, c-format
-msgid "Zone %d: marked in use, no file uses it."
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
 #, fuzzy, c-format
-msgid "Zone %d: in use, counted=%d\n"
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
-msgstr ""
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
+msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 #, fuzzy
 msgid "bad inode size"
 msgstr "Tamainua (MBtan): "
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, fuzzy, c-format
 msgid "%s is clean, no check.\n"
 msgstr "Ez dago *BSD partiziorik %s-(e)n.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, fuzzy, c-format
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr "%6ld zona erabilita (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zona erabilita (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -909,7 +909,7 @@ msgid ""
 "%6d files\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1035,7 +1035,7 @@ msgstr "inodo gehiegi - gehienezkoa 512 da"
 msgid "not enough space, need at least %llu blocks"
 msgstr "ez dago nahikoa leku, %llu bloke behar dira gutxienez"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Gailua: %s\n"
@@ -1192,7 +1192,7 @@ msgstr "%6.2f%% (%+ld bytes)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
+msgid "cannot close file %s"
 msgstr "Ezin da '%s' fitxategia ireki"
 
 #: disk-utils/mkfs.cramfs.c:728
@@ -1295,186 +1295,196 @@ msgid ""
 "that some device files will be wrong."
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr ""
 "Erabilera: %s [-c | -l fitxategi-izena] [-nXX] [-iXX] /dev/izena [blokeak]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "ezin dira bootbit sektoreak ezabatu"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "   w   idatzi diskoaren etiketa diskoan"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "   w   idatzi diskoaren etiketa diskoan"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "   w   idatzi diskoaren etiketa diskoan"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "   w   idatzi diskoaren etiketa diskoan"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr " %s: write-k huts egin du"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "bloke oker geheigi"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, c-format
 msgid "%s: not enough good blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "ezin izan da nahikoa buffer memoria esleitu"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "ezin izan da nahikoa buffer memoria esleitu"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "ezin izan da nahikoa buffer memoria esleitu"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodo\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld bloke\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, fuzzy, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr "Gehienezko tamainua=%ld\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "%s: lseek-ek huts egin du"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, fuzzy, c-format
 msgid "%d bad blocks\n"
 msgstr "%ld bloke\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, fuzzy, c-format
 msgid "one bad block\n"
 msgstr "orri oker bat\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "%s: ezin da %s blokeo fitxategia ireki: %s\n"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "ezin da badblocks fitxategia irakurri"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "Tamainua (MBtan): "
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat-ek huts egin du"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: open-ek huts egin du"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: gailua okupatua dago"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, c-format
 msgid "%s: number of blocks too small"
 msgstr ""
@@ -1804,7 +1814,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2137,7 +2147,7 @@ msgid "   Logical"
 msgstr "   Logikoa"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Ezezaguna"
 
@@ -2793,12 +2803,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD disko etiketa komandoa (m laguntza erakusteko):"
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Lehenengo %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Azken %s-(e)a edo +tamainua edo +tamainuaM edo +tamainuaK"
@@ -2944,7 +2954,7 @@ msgid "tracks/cylinder"
 msgstr "pistak zilindroko"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "zilindroak"
 
@@ -3016,12 +3026,12 @@ msgstr "Gehienezko partizio kopurua sortu da\n"
 msgid "This partition already exists.\n"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Abisua: partizio gehiegi (%d, gehienezkoa %d da).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3252,7 +3262,7 @@ msgstr "Ezarri egin behar duzu"
 msgid "heads"
 msgstr "buruak"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektoreak"
 
@@ -3646,7 +3656,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Gailua"
 
@@ -3728,7 +3738,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3864,41 +3874,41 @@ msgstr "Ezin da '%s' fitxategia ireki"
 msgid "Syncing disks.\n"
 msgstr "Diskak sinkronizatzen.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, fuzzy, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 "\n"
 "Swap partizioak ez da swap moetakoa.\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 #, fuzzy
 msgid "New beginning of data"
 msgstr "   e   diskoaren data editatu"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 #, fuzzy
 msgid "Expert command (m for help): "
 msgstr "BSD disko etiketa komandoa (m laguntza erakusteko):"
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Zilindro kopurua"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Buru kopurua"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Sektore kopurua pistako"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3907,48 +3917,48 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "%s diskak ez dauka partizio taula zuzena\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Ezin da %s ireki\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "ezin da %s ireki\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, fuzzy, c-format
 msgid "%c: unknown command\n"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Komandoa (m laguntza erakusteko)"
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -3957,16 +3967,16 @@ msgstr ""
 "\n"
 "Uneko abio fitxategia: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Mesedez sartu abio fitxategi berriaren izena:"
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, fuzzy, c-format
 msgid "Boot file unchanged\n"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4242,7 +4252,7 @@ msgstr "\tOhiz kanpoko abio fitxategi izena aukeratu duzu.\n"
 
 #: fdisk/fdisksgilabel.c:536
 #, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
 msgstr ""
 
 #: fdisk/fdisksgilabel.c:542
@@ -4254,7 +4264,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "BAI\n"
 
@@ -4433,26 +4443,26 @@ msgstr "Baliogabeko sektore baloreak"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Baliogabeko sektore baloreak"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, fuzzy, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4460,14 +4470,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4476,7 +4486,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4489,7 +4499,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4501,30 +4511,30 @@ msgstr ""
 "%s diskoa: %d buru, %llu sektore, %d zilindro\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 #, fuzzy
 msgid "Number of alternate cylinders"
 msgstr "Sartu zilindro kopurua:"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 #, fuzzy
 msgid "Extra sectors per cylinder"
 msgstr "Sartu pistako zenbat sektore kopurua:"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Bira minutuko (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 #, fuzzy
 msgid "Number of physical cylinders"
 msgstr "Sartu zilindro kopurua:"
@@ -4982,7 +4992,7 @@ msgstr "Ezin da diskoaren tamainua lortu"
 msgid "Disk %s: cannot get size\n"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4990,56 +5000,56 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr "Buruak: %d   Sektoreak pistako: %d   Zilindroak: %lld"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5048,107 +5058,107 @@ msgstr ""
 "Id  Izena\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Partizio taula berriz irakurtzen ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
 "before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Errorea %s itxitzerakoan\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ez dago horrelako partiziorik\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 #, fuzzy
 msgid "unrecognized format - using sectors\n"
 msgstr "Inprimatu taula raw datu formatua erabiliz"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, fuzzy, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "UTC ordua erabiltzen.\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 #, fuzzy
 msgid "No partitions found\n"
 msgstr "Ez dago partizio gehiago"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5156,368 +5166,431 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 #, fuzzy
 msgid "no partition table present.\n"
 msgstr "Partizio taula moeta ezezaguna"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1246
-#, fuzzy, c-format
-msgid "Warning: partition %s "
-msgstr "berirakurri partizio taula"
-
-#: fdisk/sfdisk.c:1247
+#: fdisk/sfdisk.c:1236
 #, fuzzy, c-format
-msgid "is not contained in partition %s\n"
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1248
 #, fuzzy, c-format
-msgid "Warning: partitions %s "
-msgstr "Partizio gehiegi"
-
-#: fdisk/sfdisk.c:1259
-#, fuzzy, c-format
-msgid "and %s overlap\n"
-msgstr "partizio logikoen teilakapena"
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Ezin da partizu huts bat ezabatu"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "hasiera"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "amaiera"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 #, fuzzy
 msgid "tree of partitions?\n"
 msgstr "Partizio gehiegi"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 #, fuzzy
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "  u          Aldatu erakusten den partizioaren tamainu unitatea"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 #, fuzzy
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "   n   BSD partizio berri bat gehitu"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "Partizio taula moeta ezezaguna"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, fuzzy, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Partizio taula diskoan idazten..."
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, fuzzy, c-format
 msgid "unrecognized input: %s\n"
 msgstr "sarrera okerra\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "zenbaki handiegia\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 #, fuzzy
 msgid "too many input fields\n"
 msgstr "orri txar gehiegi"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Baliogabeko moeta\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 #, fuzzy
 msgid "Warning: empty partition\n"
 msgstr "Ezin da partizu huts bat ezabatu"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "sarrera okerra\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "partizio gehiegi\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Erabilera: %s [aukerak] gailua ...\n"
+msgstr "Erabilera:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "gailua: /dev/hda edo /dev/sda moduko zerbait"
+msgid " %s [options] <device> [...]\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "aukera baliogarriak:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2364
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Erabilera:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5526,63 +5599,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 #, fuzzy
 msgid "no command?\n"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "guztira: %llu bloke\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ezin da \"%s\" ireki irakurketarako"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ezin da \"%s\" ireki irakurketarako"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, fuzzy, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%d buru, %llu sektore pistako, %d zilindro"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5590,43 +5663,43 @@ msgstr ""
 "Eginda\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, fuzzy, c-format
 msgid "Bad Id %lx\n"
 msgstr "ezin da %s id-a ezabatu (%s)\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 #, fuzzy
 msgid "This disk is currently in use.\n"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5634,73 +5707,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Egoera zaharra:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Egoera berria:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Mesedez erantzun y,n edo q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, fuzzy, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr "Partizio taula diskoan idatzi da"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5728,100 +5801,101 @@ msgstr "Diskak sinkronizatzen.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+msgid "succeeded"
 msgstr ""
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s-(e)k huts egin du.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: ez da aurkitu\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "crc errorea"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, fuzzy, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "Ordulariaren tick-ari itxaroten\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5829,58 +5903,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: gailu gehiegi\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "/proc montatua dago?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr ""
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr ""
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: argumentu gehiegi\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -5897,34 +5971,67 @@ msgstr ""
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
+#: getopt/getopt.c:323
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+
+#: getopt/getopt.c:324
+msgid " -h, --help                   This small usage guide\n"
+msgstr ""
+
+#: getopt/getopt.c:325
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:326
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+
+#: getopt/getopt.c:327
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "Inprimatu taula sektore bidez ordenatua"
+
+#: getopt/getopt.c:329
+msgid " -Q, --quiet-output           No normal output\n"
 msgstr ""
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:330
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+
+#: getopt/getopt.c:331
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr ""
+
+#: getopt/getopt.c:332
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr ""
+
+#: getopt/getopt.c:333
+msgid " -V, --version                Output version information\n"
+msgstr ""
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 #, fuzzy
 msgid "missing optstring argument"
 msgstr "col: -l baliogabeko argumentua %s.\n"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr ""
 
@@ -6330,137 +6437,151 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 msgid "Unable to connect to audit system"
 msgstr ""
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time."
 msgstr ""
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr ""
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
 msgstr ""
@@ -6634,7 +6755,7 @@ msgid "failed to read mtab"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
@@ -6676,72 +6797,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: mount-ek huts egin du"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
@@ -6830,7 +6991,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Pasahitza: "
 
@@ -7259,47 +7420,48 @@ msgstr ""
 msgid "too many bare linefeeds."
 msgstr "orri txar gehiegi"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr ""
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, fuzzy, c-format
 msgid "Last login: %.*s "
 msgstr "               Lehena     Azkena\n"
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, fuzzy, c-format
 msgid "from %.*s\n"
 msgstr "%s-(e)tik renice-ea\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, fuzzy, c-format
 msgid "on %.*s\n"
 msgstr "        disko guztian. "
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "huts egin da stdout-era idazten"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, fuzzy, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "        disko guztian. "
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, fuzzy, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "        disko guztian. "
@@ -7327,7 +7489,7 @@ msgstr ""
 msgid "setuid failed"
 msgstr "setuid()-k huts egin du"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "exec %s-(e)k huts egin du"
@@ -7372,8 +7534,8 @@ msgstr ""
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "fork-ek huts egin du"
 
@@ -7425,24 +7587,21 @@ msgstr ""
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7553,32 +7712,32 @@ msgstr " Ezabatu"
 msgid "failed to add line to output"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "crc errorea"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "hexdump: ezin da %s  irakurri.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc()-ek huts egin du"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7589,91 +7748,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Erabilgarri dauden komandoak:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "<i> (ez dago iradokizunik) </i>"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
@@ -7698,12 +7882,12 @@ msgstr "%s: ezin da \"%s\" prozesua aurkitu\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr ""
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "erabilera: %s [ -s seinalea | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr ""
@@ -7723,82 +7907,81 @@ msgstr "socket: %s.\n"
 msgid "connect %s"
 msgstr ""
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr ""
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "aukera baliogarriak:"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Hurrengo fitxategia: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "memoriatik kanpo"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "Partizio taula moeta ezezaguna"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -7938,7 +8121,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
 #: misc-utils/lsblk.c:809
@@ -7956,12 +8139,13 @@ msgstr "huts egin da lerro buffer-a hasieratzen\n"
 msgid "failed to parse list '%s'"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7969,7 +8153,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -7992,40 +8176,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Erabilera: %s [aukera]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, fuzzy, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%6.2f%% (%+ld bytes)\t%s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "exec %s-(e)k huts egin du"
@@ -8045,22 +8229,12 @@ msgstr "fsck: %s: ez da aurkitu\n"
 msgid "%s - No such file or directory\n"
 msgstr "erro inodoa ez da direktorioa"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8072,19 +8246,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date argumentua luzeegia da\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8094,169 +8267,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "sarrera okerra\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "idatzi"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "read-ek huts egin du: %s"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 #, fuzzy
 msgid "bad response length"
 msgstr "fitxategi luzeera okerra"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "%d baliogabeko ekintza\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, fuzzy, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "%s: baliogabeko %s time_t balorea\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, fuzzy, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "errorea: UUIDa irakurtzean huts egin da"
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, fuzzy, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "uuid-rik ez\n"
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "uuid-rik ez\n"
+msgstr[1] "uuid-rik ez\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "%d baliogabeko ekintza\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "sarrera okerra\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, fuzzy, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "errorea: UUIDa irakurtzean huts egin da"
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "errorea: UUIDa irakurtzean huts egin da"
+msgstr[1] "errorea: UUIDa irakurtzean huts egin da"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, fuzzy, c-format
 msgid "List of UUIDs:\n"
 msgstr "UUID zerrenda:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8264,29 +8435,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8320,42 +8490,43 @@ msgstr " %s: write-k huts egin du"
 
 #: misc-utils/wipefs.c:240
 #, c-format
-msgid "%zd bytes ["
-msgstr "%zd byte ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Baliogabeko zilindro baloreak"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8446,120 +8617,118 @@ msgstr "errorea: malloc-ek huts egin du"
 msgid "can't rename %s to %s: %s\n"
 msgstr "Gehitu \"%s\" hiztegiari"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 "\n"
 "Ez da swap partiziorik existitzen.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr "  t          Aldatu fitxategi sistema moeta"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, fuzzy, c-format
 msgid ", encryption type %d\n"
 msgstr "Partizio moeta"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, fuzzy, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "Ezin da  raw gailu nagusia ireki '"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%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/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Memoriaz kanpo pasahitza irakurtzen zen bitartean"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, fuzzy, c-format
 msgid "del_loop(%s): success\n"
 msgstr "Loop gailua %s da\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8567,51 +8736,48 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop gailua %s da\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: gailua okupatua dago"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9125,161 +9291,164 @@ msgstr ""
 msgid "not enough memory"
 msgstr "ez dago nahikoa memoria"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, fuzzy, c-format
 msgid "%s: reinitializing the swap."
 msgstr "Linux swap"
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "execv-ek huts egin du"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "waitpid-ek huts egin du"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek-ek huts egin du"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "berdina"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s-(e)-n\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon-ek huts egin du"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr ""
 "\n"
 "BSD etiketa gailuarentzat: %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "Ez zara super-erabiltzailea"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff-ek huts egin du"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9549,7 +9718,7 @@ msgstr "berirakurri partizio taula"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -9609,19 +9778,13 @@ msgstr "        (%s partizio tabla atzeman da). "
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "%s diskak ez dauka partizio taula zuzena\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -9632,47 +9795,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Erabilgarri dauden komandoak:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
@@ -9802,7 +9964,7 @@ msgstr "huts egin da lerro buffer-a hasieratzen\n"
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "huts egin da %s exekutatzen"
@@ -10064,7 +10226,7 @@ msgstr ""
 msgid "Can't set signal handler"
 msgstr ""
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday-ek huts egin du"
 
@@ -10073,24 +10235,24 @@ msgstr "gettimeofday-ek huts egin du"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr ""
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr ""
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
@@ -10181,124 +10343,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "Ezin da ireki"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "aukera baliogarriak:"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "<i> (ez dago iradokizunik) </i>"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync-ek huts egin du"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "write-k huts egin du: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctl-ek huts egin du"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10306,41 +10451,41 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate-k huts egin du"
@@ -10348,103 +10493,102 @@ msgstr "%s: fallocate-k huts egin du"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr ""
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: ezin da %s blokeo fitxategia ireki: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: zenbaki okerra: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: fork-ek huts egin du: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Erabilera: %s%s [aukerak] [aplikazioa [aplikazioa argumentuak]]\n"
 "\n"
 "Aukerak:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s: stat-ek huts egin du"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "erro inodoa ez da direktorioa"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr " %s: write-k huts egin du"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr " %s: write-k huts egin du"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10453,97 +10597,87 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "erro inodoa ez da direktorioa"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr " %s: write-k huts egin du"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "aukera baliogarriak:"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "Irteten - ez da ezer aldatu\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr "ezin da %s id-a ezabatu (%s)\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr "ezin da %s id-a ezabatu (%s)\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "Semaforo id-a: %d\n"
@@ -11039,7 +11173,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:621
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:623
@@ -11049,7 +11183,7 @@ msgstr "`%s' fitxategiak %05o modua dauka\n"
 
 #: sys-utils/ipcs.c:625
 #, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:628
@@ -11080,7 +11214,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:647
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:649
@@ -11111,7 +11245,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:680
 #, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:682
@@ -11159,69 +11293,67 @@ msgstr ""
 msgid "invalid iflag: %s"
 msgstr "baliogabeko id-a: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "baliogabeko abiadura: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s-(e)tik renice-ea\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "baliogabeko aukera"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ezin da lerroaren disziplina ezarri"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "%d abiadurak ez du euskarririk"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "ezin da lerroaren disziplina ezarri"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "Ezin da ireki"
@@ -11375,48 +11507,43 @@ msgstr "%s cachea:"
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMA noduak:"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "erro inodoa ez da direktorioa"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s montatua dago.\t"
@@ -11439,55 +11566,50 @@ msgid ""
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: errorea %s idazten: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, fuzzy, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "lerro luzeegia"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "guztira"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11496,240 +11618,231 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "%s-(e)tik renice-ea\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Komando ezezaguna: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "renice: %s: balio okerra\n"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "erabiltzailea"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: %d prioritate zaharra, %d prioritate berria\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Erabilera: %s [aukerak] gailua ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "irakurri rtc ordua"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "irakurri sistemaren ordua"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "%s: baliogabeko %s time_t balorea\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "ezarri rtc alarma"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "ezarri rtc alarma"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "ezarri rtc alarma"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "ezarri rtc alarma"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "%s: baliogabeko %s time_t balorea\n"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "sarrera okerra\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC ordua erabiltzen.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Ordu lokala erabiltzen.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: ezin dira inotify gertaerak irakurri"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "huts egin da %s exekutatzen"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "read-ek huts egin du: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -11783,17 +11896,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr ""
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "%s: argumentu gehiegi\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "huts egin da lerro buffer-a hasieratzen\n"
@@ -11879,173 +11992,170 @@ msgstr "%s %d IRQ-a erabiltzen\n"
 msgid "%s using polling\n"
 msgstr "%s azterketa erabiltzen\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
-msgstr ""
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
+msgstr "erabilera: %s aplikazioa [argumentua ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshared-ek huts egin du"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "ezin da %s ireki"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: ezin da %s-(r)engan exec egin: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s: ezin da %s-(r)engan exec egin: %m"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: ezin da \"%s\" prozesua aurkitu\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: ezin da %s-(r)engan exec egin: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "huts egin da lerro buffer-a hasieratzen\n"
+
+#: term-utils/agetty.c:649
 #, fuzzy, c-format
 msgid "bad timeout value: %s"
 msgstr "renice: %s: balio okerra\n"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "%s: argumentu gehiegi\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "huts egin da lerro buffer-a hasieratzen\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "abiadura okerra: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 #, fuzzy
 msgid "too many alternate speeds"
 msgstr "orri txar gehiegi"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr ""
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr ""
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr ""
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "moeta: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: irakurri: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, fuzzy, c-format
 msgid "%s: input overrun"
 msgstr "sarrera okerra\n"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12057,69 +12167,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "erabiltzailea"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "erabiltzaileak"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "aukera baliogarriak:"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "unshared-ek huts egin du"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "stat-ek huts egin du: %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "%s montatua dago.\t"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "%s montatua dago.\t"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "%s: get size egiterakoan huts egin da"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "baliogabeko id-a: %s\n"
@@ -12132,131 +12236,122 @@ msgid ""
 "Program not started."
 msgstr ""
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "ezin da %s `timing' fitxategia ireki"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, fuzzy, c-format
 msgid "Script started on %s"
 msgstr "        disko guztian. "
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "ezin da %s `typescript' fitxategia ireki"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr "        disko guztian. "
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "stat-ek huts egin du: %s"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "%s: Memoriaz kanpo!\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "ezin da %s `typescript' fitxategia ireki"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "huts egin da stdout-era idazten"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "ezin da %s `typescript' fitxategia ireki"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr ""
@@ -12267,110 +12362,107 @@ msgid "Argument error."
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "Irteten - ez da ezer aldatu\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "Ezin da '%s' fitxategia ireki"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "Ezin da  raw gailu nagusia ireki '"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "crc errorea"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Disko etiketa idazten %s-(e)ri.\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "read-ek huts egin du: %s"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 msgid "$TERM is not defined."
 msgstr ""
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: %s seinale ezezaguna\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12398,140 +12490,142 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "baliogabeko aukera"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "renice: %s: balio okerra\n"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "ezin da %s `timing' fitxategia ireki"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Ezin da diskoaren tamainua lortu"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr ""
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr ""
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s: stat-ek huts egin du"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "read-ek huts egin du: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 msgid "can't find your tty's name"
 msgstr ""
 
-#: term-utils/write.c:146
-msgid "you have write permission turned off."
+#: term-utils/write.c:148
+msgid "you have write permission turned off"
 msgstr ""
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "Partizio hau dagoeneko erabilita dago"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, c-format
 msgid "%s has messages disabled on %s"
 msgstr ""
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "Markatu erabilia dagoela"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, c-format
 msgid "%s has messages disabled"
 msgstr ""
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr ""
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Sarrera lerro luzeegia.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc-ek huts egin du"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "aukera baliogarriak:"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -12710,7 +12804,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -12886,7 +12980,7 @@ msgstr ""
 "\n"
 "Patroia ez da aurkitu\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Patroia ez da aurkitu"
 
@@ -12951,7 +13045,7 @@ msgstr "hexdump: {%s} formatu okerra\n"
 msgid "bad conversion character %%%s"
 msgstr ""
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -12979,7 +13073,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -12987,81 +13081,81 @@ msgstr ""
 "%s: Erabilera: %s [-zenbakia] [-p katea] [-cefnrs] [+lerroa] [+/patroia/] "
 "[fitxategiak]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: aukerak argumentua behar du -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: baimenik gabeko aukera -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...aurrera saltatzen\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...atzera saltatzen\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Ez da testu fitxategia"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Ez dago aurreko fitxategirik"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Errorea %s fitxategia irakurtzen\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Ezin da aldi baterako fitxategia sortu\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE errorea: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Ezin da ireki"
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "gordeta"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork()-ek huts egin du, saiatu beranduago\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Hurrengo fitxategia: "
 
@@ -13129,8 +13223,8 @@ msgstr "Erabilera: %s [aukerak] gailua ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13146,39 +13240,95 @@ msgstr "huts egin da lerro buffer-a hasieratzen\n"
 msgid "no input file specified"
 msgstr "Ez da --date aukerarik zehaztu.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "arazoa terminfo irakurtzen"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr ""
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Sarrera lerro luzeegia.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Erabilera:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr "Ezin da '%s' fitxategia ireki"
+
+#, fuzzy
+#~ msgid "Warning: partition %s "
+#~ msgstr "berirakurri partizio taula"
+
+#, fuzzy
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Partizio gehiegi"
+
+#, fuzzy
+#~ msgid "and %s overlap\n"
+#~ msgstr "partizio logikoen teilakapena"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "gailua: /dev/hda edo /dev/sda moduko zerbait"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd byte ["
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "aukera baliogarriak:"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Erabilera: %s [aukerak] gailua ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Erabilera: %s [aukerak] gailua ...\n"
 
 #~ msgid "  %s --report [devices]\n"
 #~ msgstr "  %s --report [gailuak]\n"
@@ -13263,10 +13413,6 @@ msgstr "Sarrera lerro luzeegia.\n"
 #~ msgid "    -v [or --version]:   print version"
 #~ msgstr "Ez inprimatu taula"
 
-#, fuzzy
-#~ msgid "dangerous options:"
-#~ msgstr "aukera baliogarriak:"
-
 #~ msgid "Couldn't open %s: %s\n"
 #~ msgstr "Ezin da %s ireki: %s\n"
 
@@ -13275,10 +13421,6 @@ msgstr "Sarrera lerro luzeegia.\n"
 #~ msgstr "%s-(e)tik renice-ea\n"
 
 #, fuzzy
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "Erabilera: %s [aukerak] gailua ...\n"
-
-#, fuzzy
 #~ msgid "can't malloc initstring"
 #~ msgstr "errorea: malloc-ek huts egin du"
 
diff --git a/po/fi.po b/po/fi.po
index 567d83b3c..52e814cf7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -18,8 +18,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.17-rc3\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2009-12-16 21:30+0200\n"
 "Last-Translator: Lauri Nurmi <lanurmi@iki.fi>\n"
 "Language-Team: Finnish <translation-team-fi@lists.sourceforge.net>\n"
@@ -118,29 +118,29 @@ msgstr "lue osiotaulu uudelleen"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "hae koko 512-tavuisina sektoreina"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "laitetta %s ei voi avata"
@@ -219,7 +219,7 @@ msgid "Verifying ... "
 msgstr "Varmistetaan... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Tiedostoa ”%s” ei voi avata"
@@ -259,15 +259,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -280,7 +280,7 @@ msgstr "%s – %s\n"
 msgid "cannot stat file %s"
 msgstr "laitteen %s tilaa ei voi lukea"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -329,8 +329,8 @@ msgid "stat failed: %s"
 msgstr "stat epäonnistui: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty epäonnistui\n"
@@ -556,55 +556,55 @@ msgstr "%s: virheellinen cramfs--virheellinen tiedostodatan siirtymä\n"
 msgid "compiled without -x support"
 msgstr "käännetty ilman -x-tukea"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Käyttö: %s [-larvsmf] /dev/nimi\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s on liitetty.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Haluatko varmasti jatkaa"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "tarkistus keskeytetty.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Vyöhykenumero < FIRSTZONE tiedostossa ”%s”."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Vyöhykenumero ≥ ZONES tiedostossa ”%s”."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Poista lohko"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Lukuvirhe: siirtyminen lohkoon ei onnistu tiedostossa ”%s”\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Lukuvirhe: viallinen lohko tiedostossa ”%s”\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -613,296 +613,296 @@ msgstr ""
 "Sisäinen virhe: yritetään kirjoittaa viallista lohkoa\n"
 "Kirjoituspyyntöä ei huomioida\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "siirtyminen epäonnistui funktiossa write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Kirjoitusvirhe: viallinen lohko tiedostossa ”%s”\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "siirtyminen epäonnistui funktiossa write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "superlohkon kirjoitus ei onnistu"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "I-solmukarttaa ei voi kirjoittaa"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Vyöhykekartan kirjoitus ei onnistu"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "I-solmuja ei voi kirjoittaa"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "siirtyminen epäonnistui"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "kartoille ei voi varata puskureita"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "superlohkoa ei voi lukea"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "virheellinen taikaluku superlohkossa"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Vain 1k-lohkot/vyöhykkeet ovat tuettuja"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "virheellinen s_imap_blocks-kenttä superlohkossa"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "virheellinen s_zmap_blocks-kenttä superlohkossa"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "I-solmukartalle ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Vyöhykekartalle ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "I-solmuille ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "I-solmujen laskemiseen ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Vyöhykkeen laskemiseen ei voi varata puskuria"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "I-solmukarttaa ei voi lukea"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Vyöhykekarttaa ei voi lukea"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "I-solmuja ei voi lukea"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varoitus: Ensimmäinenvyöhyke != Norm_ensimmäinenvyöhyke\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld i-solmua\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld lohkoa\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Ensimmäinendatavyöhyke=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Vyöhykekoko=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxkoko=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Tied.järj. tila=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "nimenpituus=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Käyttämättömäksi merkittyä i-solmua %d käytetään tiedostoon ”%s”\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Merkitse käyttöön"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Tiedostolla ”%s” on tila %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Varoitus i-solmujen määrä on liian suuri.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "juuren i-solmu ei ole hakemisto"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Lohkoa on käytetty aikaisemmin. Nyt tiedostossa ”%s”."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Lohko %d tiedostossa ”%s” on merkitty käyttämättömäksi."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Korjaa"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "Hakemisto ”%s” sisältää virheellisen i-solmunumeron tiedostolle ”%.*s”."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Poista"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: viallinen hakemisto: ”.” ei ole ensimmäisenä\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: viallinen hakemisto: ”..” ei ole toisena\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "sisäinen virhe"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: viallinen hakemisto: koko < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "siirtyminen epäonnistui funktiossa bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "I-solmun %d tila ei ole tyhjennetty."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "I-solmua %d ei käytetä, merkitty käytetyksi bittikartassa."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "I-solmu %d käytössä, merkitty käyttämättömäksi bittikartassa."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Aseta"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-solmu %d (tila = %07o), i_linkkimäärä=%d, laskettu=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Aseta i_linkkimäärä lasketun mukaiseksi"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Vyöhyke %d: merkitty käyttöön, mutta mikään tiedosto ei käytä sitä."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Poista merkintä"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Vyöhyke %d: käytössä, laskettu=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Vyöhyke %d: ei käytössä, laskettu=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "virheellinen i-solmun koko"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "virheellinen v2 i-solmun koko"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "vuorovaikutteisiin korjauksiin tarvitaan pääte"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "laitetta ”%s” ei voi avata: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s on puhdas, ei tarkistusta.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Pakotetaan tiedostojärjestelmän tarkistus laitteella %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Tiedostojärjestelmä laitteella %s on likainen, vaatii tarkistuksen.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -911,12 +911,12 @@ msgstr ""
 "\n"
 "%6ld i-solmua käytetty (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld vyöhykettä käytetty (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -939,7 +939,7 @@ msgstr ""
 "------\n"
 "%6d tiedostoa\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1063,7 +1063,7 @@ msgstr "liian monta i-solmua – maksimi on 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "tila ei riitä, vaaditaan vähintään %llu lohkoa"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Laite: %s\n"
@@ -1237,10 +1237,8 @@ msgstr "%6.2f%% (%+ld tavua)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Virhe suljettaessa tiedostoa\n"
+msgid "cannot close file %s"
+msgstr "Tiedostoa ”%s” ei voi avata"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1350,88 +1348,98 @@ msgstr ""
 "VAROITUS: laitenumerot typistetty %u bittiin. Tämä tarkoittaa lähes\n"
 "varmasti, että jotkut laitetiedostot ovat väärin.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Käyttö: %s [-c | -l tiedostonimi] [-nXX] [-iXX] /dev/nimi [lohkot]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s on liitetty; ei tehdä tiedostojärjestelmää tähän!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "siirtyminen käynnistyslohkoon epäonnistui funktiossa write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "käynnistyssektorin tyhjentäminen ei onnistu"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "siirtyminen epäonnistui funktiossa write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "superlohkon kirjoitus ei onnistu"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "i-solmukarttaa ei voi kirjoittaa"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "vyöhykekarttaa ei voi kirjoittaa"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "i-solmuja ei voi kirjoittaa"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "siirtyminen epäonnistui funktiossa write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "kirjoitus epäonnistui funktiossa write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "liian monta viallista lohkoa"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "ei riittävästi ehjiä lohkoja"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "kartoille ei voi varata puskureita"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "kartoille ei voi varata puskureita"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "i-solmuille ei voi varata puskureita"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld i-solmua\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld lohkoa\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1440,98 +1448,98 @@ msgstr ""
 "Maxkoko=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "siirtyminen epäonnistui lohkojen testauksen aikana"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Outoja arvoja funktiossa do_check: todennäköisesti ohjelmistovikoja\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "siirtyminen epäonnistui funktiossa check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "virheellisiä lohkoja ennen data-aluetta: tiedostojärjestelmää ei voi luoda"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d viallista lohkoa\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "yksi viallinen lohko\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "vialliset lohkot sisältävää tiedostoa ei voi avata"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "badblocks-tiedostoa ei voi lukea"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "virheellinen i-solmun koko"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol-virhe: lohkojen määrää ei ole annettu"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s epäonnistui.\n"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty epäonnistui\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: laite on varattu"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "laitteen %s kokoa ei voi hakea"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "ei yritetä luoda tiedostojärjestelmää kohteeseen ”%s”"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Sektorien määrä"
@@ -1865,7 +1873,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "siirtyminen epäonnistui funktiossa write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2208,7 +2216,7 @@ msgid "   Logical"
 msgstr "   Looginen"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Tuntematon"
 
@@ -2867,12 +2875,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD-levynimiökomento (m antaa ohjeen): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Ensimmäinen %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Viimeinen %s tai +koko tai +kokoM tai +kokoK"
@@ -3018,7 +3026,7 @@ msgid "tracks/cylinder"
 msgstr "uraa/sylinteri"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "sylinterit"
 
@@ -3085,12 +3093,12 @@ msgstr "Maksimimäärä osioita on luotu\n"
 msgid "This partition already exists.\n"
 msgstr "Tämä osio on jo olemassa.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Varoitus: liian monta osiota (%d, maksimi on %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3293,7 +3301,7 @@ msgstr "On asetettava"
 msgid "heads"
 msgstr "päät"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektorit"
 
@@ -3721,7 +3729,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Käynn     Alku          Loppu    Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Laite"
 
@@ -3807,7 +3815,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld varaamatonta %d-tavuista sektoria\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Osio %d on jo määritelty. Poista se ennen uudelleen lisäämistä.\n"
@@ -3962,37 +3970,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Synkronoidaan levyt.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Osiolla %d ei ole data-aluetta\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Uusi datan alku"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Asiantuntijakomento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Sylinterien määrä"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Päiden määrä"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Sektorien määrä"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varoitus: asetetaan sektorisiirtymä DOS-yhteensopivuutta varten\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4005,32 +4013,32 @@ msgstr ""
 "GPT:tä. Käytä GNU Partediä.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "laitetta %s ei voi avata\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: tuntematon komento\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Tämä ydin löytää sektorin koon itse – -b-valitsinta ei huomioida\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4039,17 +4047,17 @@ msgstr ""
 "Varoitus: valitsinta -b (sektorikoon asetus) tulee käyttää yhden annetun "
 "laitteen kanssa\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Havaittiin OSF/1-levynimiö laitteella %s, siirrytään levynimiötilaan.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Komento (m antaa ohjeen): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4058,16 +4066,16 @@ msgstr ""
 "\n"
 "Nykyinen käynnistystiedosto on: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Anna uuden käynnistystiedoston nimi: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Käynnistystiedosto muuttumaton\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4387,9 +4395,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tValittu käynnistystiedoston nimi on epätavallinen.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Valitettavasti vain ei-tyhjien osioiden lippua voi muuttaa.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Valitettavasti vain pääkäyttäjä voi säätää järjestelmäkelloa.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4405,7 +4413,7 @@ msgstr ""
 "Vain ”SGI volume” -kokolevyosuus voi rikkoa tätä sääntöä.\n"
 "Kirjoita JAA, jos olet varma tämän osion merkitsemisestä toisin.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "JAA\n"
 
@@ -4603,7 +4611,7 @@ msgstr "Käyttämätöntä tilaa – sektorit 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Käyttämätöntä tilaa – sektorit %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4612,7 +4620,7 @@ msgstr ""
 "Muut osiot käyttävät jo koko levyn.\n"
 "Poista/kutista joitakin ennen uutta yritystä.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4621,12 +4629,12 @@ msgstr ""
 "On erittäin suositeltavaa, että kolmas osio kattaa koko levyn ja\n"
 "on tyyppiä ”Koko levy”\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4636,7 +4644,7 @@ msgstr ""
 "Kolmas osio ei kata koko levyä, mutta arvo %d %s kattaa jonkin toisen\n"
 "osion. Merkintä on muutettu arvoon %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4645,7 +4653,7 @@ msgstr ""
 "Jos halutaan säilyttää SunOS/Solaris-yhteensopivuus, tämän osion tyyppinä\n"
 "on syytä säilyttää Koko levy (5), alkaen kohdasta 0, %u sektoria\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4659,7 +4667,7 @@ msgstr ""
 "Kirjoita JAA, jos olet erittäin varma, että haluat osion tyypiksi\n"
 "merkittävän 82 (Linux-sivutus): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4681,7 +4689,7 @@ msgstr ""
 "Yksiköt = %13$d * 512 -tavuiset %12$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4694,28 +4702,28 @@ msgstr ""
 "Yksiköt = %6$d * 512 -tavuiset %5$s\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Lippu   Alku        Loppu  Lohkot   Id  Järjestelmä\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Vaihtoehtoisten sylinterien määrä"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Ylimääräisiä sektoreita sylinterillä"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Lomituskerroin"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Pyörimisnopeus (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Fyysisten sylinterien määrä"
 
@@ -5172,7 +5180,7 @@ msgstr "Levy %s: geometriaa ei voi hakea\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Levy %s: kokoa ei voi hakea\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5183,22 +5191,22 @@ msgstr ""
 "levyltä. Sen muokkaaminen fdiskillä on todennäköisesti turhaa.\n"
 "[Käytä --force -valitsinta jos todella haluat tehdä niin]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varoitus: HDIO_GETGEO kertoo, että päitä on %lu\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varoitus: HDIO_GETGEO kertoo, että sektoreita on %lu\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varoitus: BLKGETSIZE/HDIO_GETGEO kertoo, että sylintereitä on %lu\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5208,7 +5216,7 @@ msgstr ""
 "Tästä aiheutuu ongelmia kaikkien C/H/S-osoitusta käyttävien ohjelmien "
 "kanssa.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5217,20 +5225,20 @@ msgstr ""
 "\n"
 "Levy %s: %lu sylinteriä, %lu päätä, %lu sektoria/ura\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "Osion %2$s %1$s pääarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
 "%lu)\n"
 msgstr "Osion %2$s %1$s sektoriarvo on mahdoton: %3$lu (tulee olla 1-%4$lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5238,7 +5246,7 @@ msgid ""
 msgstr ""
 "Osion %2$s %1$s sylinteriarvo on mahdoton: %3$lu (tulee olla 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5247,12 +5255,12 @@ msgstr ""
 "Id  Nimi\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Luetaan osiotaulu uudelleen...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5262,26 +5270,26 @@ msgstr ""
 "Aja partprobe(8), kpartx(8) tai käynnistä järjestelmä\n"
 "uudelleen nyt, ennen mkfs:n käyttöä\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Virhe suljettaessa %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: osiota ei ole\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "tunnistamaton muoto – käytetään sektoreita\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "toteuttamaton muoto – käytetään %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5291,12 +5299,12 @@ msgstr ""
 "alkaen\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Laite Käynn Alku      Loppu #syl     #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5305,12 +5313,12 @@ msgstr ""
 "Yksiköt = 512-tavuiset sektorit, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Laite  Käynn   Alku        Loppu #sektorit Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5319,12 +5327,12 @@ msgstr ""
 "Yksiköt = 1024-tavuiset lohkot, alkaen kohdasta %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Laite  Käynn  Alku        Loppu  #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5334,31 +5342,31 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Laite Käynn Alku    Loppu  MiB    #lohkot   Id  Järjestelmä\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\talku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tloppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "osio loppuu sylinterillä %ld, joka on levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Osioita ei löytynyt\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5369,51 +5377,41 @@ msgstr ""
 "  arvoille C/H/S=*/%ld/%ld (eikä %ld/%ld/%ld).\n"
 "Tässä listauksessa käytetään tuota geometriaa.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "osiotaulua ei ole.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "outoa, vain %d osiota määritelty.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Varoitus: osion %s koko on 0, mutta sitä ei ole merkitty tyhjäksi\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varoitus: osion %s koko on 0 ja se on merkitty käynnistettäväksi\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varoitus: osion %s koko on 0 ja alkukohta ei ole nolla\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Varoitus: osio %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "ei sisälly osioon %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Varoitus: osiot %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "ja %s ovat päällekkäiset\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Varoitus: osio %d on tyhjä\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5422,17 +5420,17 @@ msgstr ""
 "Varoitus: osio %s sisältää osan osiotaulusta (sektori %lu), ja se tulee\n"
 "tuhoutumaan kun osiota käytetään\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varoitus: osio %s alkaa sektorilta 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varoitus: osio %s jatkuu levyn lopun yli\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5440,17 +5438,17 @@ msgstr ""
 "Vain yksi ensiöosio voi olla laajennettu\n"
 " (tämä ei tosin ole ongelma Linuxissa)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei ala sylinterin rajalta\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varoitus: osio %s ei lopu sylinterin rajalle\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5459,7 +5457,7 @@ msgstr ""
 "(aktiiviseksi)\n"
 "Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä levyltä.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5467,7 +5465,7 @@ msgstr ""
 "Varoitus: yleensä vain ensiöosiolta voi käynnistää\n"
 "LILO ei välitä ”käynnistettävä”-lipusta.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5476,32 +5474,32 @@ msgstr ""
 "(aktiiviseksi). Se ei haittaa LILOa, mutta DOS MBR ei käynnistä tältä "
 "levyltä.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "alun"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "osio %s: alku: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "lopun"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "osio %s: loppu: (c,h,s) odotettiin (%ld,%ld,%ld) löytyi (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "osio %s loppuu sylinterillä %ld, levyn lopun jälkeen\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5510,7 +5508,7 @@ msgstr ""
 "Varoitus: laajennetun osion alkua siirretty kohdasta %ld kohtaan %ld\n"
 "(Vain listaustarkoituksiin. Älä muuta sen sisältöä.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5518,131 +5516,131 @@ msgstr ""
 "Varoitus: laajennetun osion alku ei ole sylinterin rajalla.\n"
 "DOS ja Linux tulkitsevat sisällön eri tavoin.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "liian monta osiota – ei huomioida numeron (%d) jälkeisiä\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "osiopuu?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "havaittiin levymanageri – tilanteesta ei selvitä\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-allekirjoitus löytyi – luovutetaan\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "outoa..., laajennettu osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "outoa..., BSD-osio, jonka koko on 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: tunnistamaton osiotaulun tyyppi\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "valitsin -n oli annettu: Mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Vanhojen sektoreiden tallennus epäonnistui – keskeytetään\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "liian pitkä tai epätäydellinen syöterivi – lopetetaan\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "syötevirhe: kentän %s jälkeen odotetaan löytyvän ”=”\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "syötevirhe: odottamaton merkki %c kentän %s jälkeen\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "tunnistamaton syöte: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "liian suuri luku\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "roskaa numeron perässä\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "ei tilaa osiokahvalle\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "ympäröivää laajennettua osiota ei voi rakentaa\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "liian monta syötekenttää\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Ei enempää tilaa\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Virheellinen tyyppi\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Varoitus: annettu koko (%lu) ylittää suurimman sallitun koon (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Varoitus: tyhjä osio\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varoitus: virheellinen osion alku (aikaisintaan %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "tunnistamaton ”käynnistettävä”-lippu – valitse - tai *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "osittainen c,h,s-määritys?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Laajennettu osio ei ole odotetussa paikassa\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "virheellinen syöte\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "liian monta osiota\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5652,99 +5650,178 @@ msgstr ""
 "<alku> <koko> <tyyppi [E,S,L,X,hex]> <käynnistettävä [-,*]> <c,h,s> <c,h,s>\n"
 "Yleensä riittää <alku> ja <koko> (ja ehkä <tyyppi>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Käyttö: %s [valitsimet] laite ...\n"
+msgstr "Käyttö:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "laite: esimerkiksi /dev/hda tai /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Valitsimet:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "vaaralliset valitsimet:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr "    -G [tai --show-pt-geometry]: näytä osiotausta päätelty geometria"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
+"                             tai odota syötteestä niiden kahvoja"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Käyttö:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s laite\t\t listaa laitteella olevat aktiiviset osiot\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s laite n1 n2 ... aktivoi osiot n1 ..., inaktivoi loput\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An laite\t aktivoi osio n, poista muiden aktivointi\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5757,62 +5834,62 @@ msgstr ""
 "GPT:tä. Käytä GNU Partediä.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Käytä --force -valitsinta ohittaaksesi tämän tarkistuksen.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "ei komentoa?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "yhteensä: %llu lohkoa\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "käyttö: sfdisk --print-id laite osionumero\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "käyttö: sfdisk --change-id laite osionumero Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "käyttö: sfdisk --id laite osionumero [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "vain yhden laitteen voi antaa (paitsi valitsimella -l tai -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "laitetta %s ei voi avata lukua-kirjoitusta varten\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "laitetta %s ei voi avata lukua varten\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld sylinteriä, %ld päätä, %ld sektoria/ura\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Laitteen %s kokoa ei voida hakea\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "virheellinen aktiivinen tavu: 0x80:n asemesta 0x%x\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5820,7 +5897,7 @@ msgstr ""
 "Valmis\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5829,35 +5906,35 @@ msgstr ""
 "Aktiivisia ensiöosioita on %d kappaletta. Tämä ei haittaa LILOa, mutta\n"
 "DOS MBR käynnistää vain levyltä, jolla on tasan yksi aktiivinen osio.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "osiolla %s id on %x eikä osiota ole kätketty\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Virheellinen Id %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Levy on tällä hetkellä käytössä.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Vakava virhe: laitetta %s ei löydy\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varoitus: %s ei ole lohkolaite\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Tarkistetaan, että kukaan ei käytä levyä juuri nyt...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5870,30 +5947,30 @@ msgstr ""
 "(komento umount) ja kaikki levyllä olevat sivutusosiot (komento swapoff).\n"
 "Käytä valitsinta --no-reread tämän testin ohittamiseen.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Käytä --force -valitsinta ohittaaksesi kaikki tarkistukset.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vanha tilanne:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Osiota %d ei ole olemassa, sitä ei voi muuttaa\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Uusi tilanne:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5901,21 +5978,21 @@ msgstr ""
 "En pidä näistä osioista – mitään ei muutettu.\n"
 "(Jos todella haluat tätä, käytä valitsinta --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "En pidä tästä – kannattaa todennäköisesti vastata ”No”\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Oletko tyytyväinen tähän? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Haluatko kirjoittaa tämän levylle? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5924,16 +6001,16 @@ msgstr ""
 "\n"
 "sfdisk: ennenaikainen syötteen loppu\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Lopetetaan – mitään ei muutettu\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Vastaa joko y, n tai q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5942,7 +6019,7 @@ msgstr ""
 "Uusi osiotaulu kirjoitettiin onnistuneesti\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5974,101 +6051,103 @@ msgstr "Synkronoidaan levyt.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s onnistui.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s epäonnistui.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "VAROITUS: tiedostoa %s ei voi avata: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: ei löytynyt\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: virhe %d purettaessa! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s ei ole lp-laite.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Pakotetaan tiedostojärjestelmän tarkistus laitteella %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6076,58 +6155,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: liian monta laitetta\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Tiedostoa %s ei voitu avata\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "Onkohan /proc liitetty?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Irrotetaan jäljellä olevat tiedostojärjestelmät..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Irrotetaan jäljellä olevat tiedostojärjestelmät..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: tuntematon argumentti: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6146,33 +6225,81 @@ msgstr "tyhjä pitkä valitsin argumentin -l tai --long jälkeen"
 msgid "unknown shell after -s or --shell argument"
 msgstr "tuntematon kuori argumentin -s tai --shell jälkeen"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+"       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] "
+"[--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            Salli pitkien valitsimien alkaminen yhdellä -:"
+"lla\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden yhteydessä\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=valitsimet     Lyhyet tunnistettavat valitsimet\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=kuori            Aseta kuoren lainauskäytännöt\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                  Testaa getopt(1):n versio\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Näytä versiotiedot\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "puuttuva valitsinmerkkijonon argumentti"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "sisäinen virhe, ota yhteyttä tekijään."
 
@@ -6633,92 +6760,110 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Ytimen epoch-arvoa ei voi asettaa.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Valitsimet:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       kertoo hwclockille Alphan tyypin (ks. hwclock(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Audit-järjestelmään yhdistäminen ei onnistu\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ottaa vain valitsimia argumentteina. Annoit %d muuta.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6727,7 +6872,7 @@ msgstr ""
 "Monta toimintoa määritelty.\n"
 "Vain yksi toiminto voidaan suorittaa kerrallaan.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6736,7 +6881,7 @@ msgstr ""
 "%s: Valitsimet --utc ja --localtime ovat toisensa poissulkevat. Annoit "
 "molemmat.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6745,7 +6890,7 @@ msgstr ""
 "%s: Valitsimet --adjust ja --noadjfile ovat toisensa poissulkevat. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6754,29 +6899,29 @@ msgstr ""
 "%s: Valitsimet --adjfile ja --noadjfile ovat toisensa poissulkevat. Käytit "
 "molempia.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: Valitsimen --noadjfile kanssa on käytettävä joko valitsinta --utc tai --"
 "localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Ei käyttökelpoista aikaa asetettavaksi. Kelloa ei voida asettaa.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Valitettavasti vain pääkäyttäjä voi säätää laitteistokelloa.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Valitettavasti vain pääkäyttäjä voi säätää järjestelmäkelloa.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6784,12 +6929,12 @@ msgstr ""
 "Valitettavasti vain pääkäyttäjä voi säätää laitteistokellon epoch-arvoa "
 "ytimessä.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "Laitteistokelloa ei pystytä käyttämään millään tunnetulla tavalla.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -6970,7 +7115,7 @@ msgid "failed to read mtab"
 msgstr "tiedoston %s tilaa ei voi lukea"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "Puskuria ei voi varata.\n"
@@ -7012,45 +7157,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7059,27 +7244,27 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla ipcmk(1).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: liitos epäonnistui"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "Puskuria ei voi varata.\n"
@@ -7169,7 +7354,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: PAM-virhe, keskeytetään: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Salasana: "
 
@@ -7618,47 +7803,48 @@ msgstr "LIIKAA rivinvaihtoja"
 msgid "too many bare linefeeds."
 msgstr "liian monta peräkkäistä rivinvaihtoa.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Kirjautuminen aikakatkaistiin %d sekunnin jälkeen\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Edellinen kirjautuminen: %.*s"
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "osoitteesta %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "päätteeltä %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "EPÄONNISTUNUT KIRJAUTUMINEN PÄÄTTEELTÄ %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA OSOITTEESTA %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d EPÄONNISTUNUTTA KIRJAUTUMISTA PÄÄTTEELTÄ %s, %s"
@@ -7688,7 +7874,7 @@ msgstr "mount: lupa evätty"
 msgid "setuid failed"
 msgstr "setuid() epäonnistui"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "käynnistys epäonnistui\n"
@@ -7735,8 +7921,8 @@ msgstr ""
 "%s: tiedoston %s lukitusta ei voi poistaa: %s (muutoksesi ovat edelleen "
 "tiedostossa %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "haarauttaminen epäonnistui\n"
@@ -7789,24 +7975,21 @@ msgstr "virheellinen vuoden arvo: käytä 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "käyttö: cal [-13smjyV] [[[päivä] kuukausi] vuosi]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7918,32 +8101,32 @@ msgstr " Poista"
 msgid "failed to add line to output"
 msgstr "Puskuria ei voi varata.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "siirtymisvirhe"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "Puskuria ei voi varata.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: tiedostoa %s ei voi lukea.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "Puskuria ei voi varata.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc() epäonnistui"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7954,49 +8137,74 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Käytettävissä olevat komennot:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8005,42 +8213,42 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla namei(1).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Ei hakemistoa %s!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "Puskuria ei voi varata.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "Puskuria ei voi varata.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "Puskuria ei voi varata.\n"
@@ -8065,12 +8273,12 @@ msgstr "%s: prosessia ”%s” ei löydy\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: tuntematon signaali %s; kelvolliset signaalit:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "käyttö: %s [ -s signaali | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signaali ]\n"
@@ -8090,87 +8298,86 @@ msgstr "LohkoKoko: %d\n"
 msgid "connect %s"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Käyttö: %s [valitsimet]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Seuraava tiedosto: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Arvo sallitun välin ulkopuolella.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: tuntematon apuneuvon nimi: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: tuntematon prioriteetin nimi: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8310,7 +8517,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8328,12 +8535,13 @@ msgstr "%s: avaaminen epäonnistui: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8341,7 +8549,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8364,7 +8572,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8373,33 +8581,33 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla wipefs(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Tiedostoa %s ei voitu avata\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Tiedostosta %2$s saatiin %1$d tavua\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "käynnistys epäonnistui\n"
@@ -8419,26 +8627,14 @@ msgstr "laitteen %s tilaa ei voi lukea"
 msgid "%s - No such file or directory\n"
 msgstr "juuren i-solmu ei ole hakemisto"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Käyttö: %s [valitsimet] polku [polku ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Valitsimet:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8450,8 +8646,7 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8459,12 +8654,12 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla namei(1).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "liian pitkä --date-argumentti\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8474,169 +8669,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: uudelleennimeäminen %s → %s epäonnistui: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: virheellinen -l -argumentti %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Kirjoita"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "luettiin %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "tiedoston %s tilaa ei voi lukea"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Laitetta %s ei voi avata: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Laitetta %s ei voi avata: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Virhe luettaessa %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "virheellinen valitsin"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "virheellinen valitsin"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: virheellinen arvo\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "virhe muutettaessa tiedoston %s tilaa: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8644,29 +8837,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8699,32 +8891,33 @@ msgid "%s: write failed"
 msgstr "openpty epäonnistui\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "tavut"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8733,11 +8926,11 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla wipefs(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8830,63 +9023,63 @@ msgstr "virhe muutettaessa tiedoston %s omistajaa: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "nimeäminen %s → %s ei onnistu: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev-hakemistoa ei ole olemassa."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", siirtymä %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", kokoraja %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", salaus %s (tyyppi %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", siirtymä %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", salaustyyppi %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: laitteen %s tietoja ei voi hakea: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: laitetta %s ei voi avata: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: ei oikeuksia laitteeseen /dev/loop#"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ei löytynyt yhtään vapaata loop-laitetta"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8896,56 +9089,54 @@ msgstr ""
 "       loop-laitteista?\n"
 "       (Jos näin on, käännä uudelleen tai suorita ”modprobe loop”.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Muisti loppui kasvatettaessa puskuria.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektori %d on jo varattu\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s on kirjoitussuojattu, liitetään vain luku -tilassa"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Muistia ei voitu lukita, poistutaan.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD epäonnistui: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): onnistui\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): onnistui\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: laitetta %s ei voi poistaa: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Tämä mount on käännetty ilman loop-tukea. Käännä uudelleen.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8953,7 +9144,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "käyttö:\n"
 "  %s loop-laite                                        # näytä tietoja\n"
@@ -8961,48 +9152,45 @@ msgstr ""
 "  %s -f                                                # etsi vapaa\n"
 "  %s [ -e salaus ] [ -o siirtymä ] loop-laite tiedosto # aseta\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loop-laite on %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: laite on varattu"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Loop-tukea ei ollut käännöksen aikana. Käännä uudelleen.\n"
@@ -9569,183 +9757,170 @@ msgstr "ohjelmistovika xstrndup-kutsussa"
 msgid "not enough memory"
 msgstr "muisti ei riitä"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Käyttö:\n"
-" %1$s -a [-e] [-v]                  ota käyttöön kaikki /etc/fstabin\n"
-"                                     sivutusalueet\n"
-" %1$s [-p priorit.] [-v] <polku>    ota käyttöön annettu sivutusalue\n"
-" %1$s -s                            näytä yhteenveto sivutuskäytöstä\n"
-" %1$s -h                            näytä ohje\n"
-" %1$s -V                            näytä versio\n"
-"\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Käyttö:\n"
-" %1$s -a [-v]                      poista käytöstä kaikki sivutusalueet\n"
-" %1$s [-v] <polku>               poista käytöstä annettu sivutusalue\n"
-" %1$s -h                           näytä ohje\n"
-" %1$s -V                           näytä versio\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: %s: odottamaton tiedostomuoto\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "käynnistys epäonnistui\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() epäonnistui"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "siirtyminen epäonnistui"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Nimi"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: varoitus: tiedostolla %s on turvattomat oikeudet %04o, suositellaan "
 "%04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 "%s: varoitus: tiedostolla %s on turvattomat oikeudet %04o, suositellaan "
 "%04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: Ohitetaan tiedosto %s – siinä vaikuttaa olevan reikiä.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "siirtyminen epäonnistui"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s laitteella %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s epäonnistui.\n"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: tiedostolle %s ei löydy laitetta\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "Et ole pääkäyttäjä.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s epäonnistui.\n"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10021,7 +10196,7 @@ msgstr "Valittiin osio %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10081,19 +10256,13 @@ msgstr "   p    näytä BSD-osiotaulu"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Levy %s ei sisällä kelvollista osiotaulua\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10104,21 +10273,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Käytettävissä olevat komennot:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10127,26 +10295,26 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla namei(1).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "Puskuria ei voi varata.\n"
@@ -10274,7 +10442,7 @@ msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 msgid "failed to set pid %d's policy"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
@@ -10546,7 +10714,7 @@ msgstr "%s: %ld oletuskynnys ja %ld oletusaikakatkaisu\n"
 msgid "Can't set signal handler"
 msgstr "Signaalikäsittelijää ei voi asettaa"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday epäonnistui"
 
@@ -10555,24 +10723,24 @@ msgstr "gettimeofday epäonnistui"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Laitteelle %s ei voi käyttää CYGETMONia: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr ""
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
@@ -10664,130 +10832,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "laitetta %s ei voi avata"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Käyttö: %s [valitsimet]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Tuntematon komento: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Ei hakemistoa %s!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync epäonnistui"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "kirjoittaminen epäonnistui: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "ei komentoa?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync epäonnistui"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Käyttö: %s [valitsimet] <tiedostonimi>\n"
-"\n"
-"Valitsimet:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10795,7 +10940,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -10804,36 +10949,36 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla fallocate(1).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Liian vähän argumentteja"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Virheellinen asetettu arvo: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "Valitsinta --date ei ole annettu.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "segmenttejä enintään = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty epäonnistui\n"
@@ -10841,66 +10986,67 @@ msgstr "openpty epäonnistui\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s vaatii argumentin\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: tiedostoa %s ei voi avata: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: virheellinen arvo\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "haarauttaminen epäonnistui\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Käyttö: %s [valitsimet] <tiedostonimi>\n"
 "\n"
 "Valitsimet:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -10908,38 +11054,37 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla wipefs(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "Valitsinta --date ei ole annettu.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "Valitsinta --date ei ole annettu.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s epäonnistui.\n"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "juuren i-solmu ei ole hakemisto"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "openpty epäonnistui\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "openpty epäonnistui\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10948,8 +11093,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -10957,95 +11102,83 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla namei(1).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "Valitsinta --date ei ole annettu.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "juuren i-solmu ei ole hakemisto"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "openpty epäonnistui\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
-"\n"
-"Käyttö: %s [valitsimet]\n"
-"\n"
 
-#: sys-utils/ipcmk.c:86
-#, c-format
-msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla ipcmk(1).\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "Viestijonon id: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "varattuja semaforeja = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "Semaforin id: %d\n"
@@ -11544,8 +11677,8 @@ msgstr ""
 "Jaetun muistin segmentti jmuisti-id=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11554,9 +11687,9 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:628
 #, c-format
@@ -11588,8 +11721,8 @@ msgstr ""
 "Viestijonon msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11620,8 +11753,8 @@ msgid ""
 msgstr ""
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11669,70 +11802,68 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "virheellinen id: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "virheellinen nopeus: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach – %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "virheellinen valitsin"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "virheellinen id: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ei ole lohkolaite"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "laitteen %s kokoa ei voi hakea"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Levyasemalla ei voi siirtyä"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "laitetta %s ei voi avata"
@@ -11887,36 +12018,31 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11925,12 +12051,12 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla ipcmk(1).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "juuren i-solmu ei ole hakemisto"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s on liitetty.\t "
@@ -11967,46 +12093,44 @@ msgstr ""
 "\t -n              poistaa käytöstä tavujärjestyksen automaattitunnistuksen\n"
 "\t -V              näyttää version ja poistuu\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: virhe kirjoitettaessa tiedostoa %s: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): väärä kartan rivi\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: merkkijonoa ”_stext” ei löydy tiedostosta %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 "%s: profiiliosoite sallitun välin ulkopuolella. Väärä karttatiedosto?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "yhteensä"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12021,10 +12145,7 @@ msgstr ""
 "\n"
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12033,8 +12154,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12042,76 +12163,64 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla unshare(1).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice – %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Tuntematon komento: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "virheellinen aikakatkaisuarvo: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "käyttäjä"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: vanha prioriteetti %d, uusi prioriteetti %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
-"Käyttö: %s [valitsimet] <tiedostonimi>\n"
-"\n"
-"Valitsimet:\n"
 
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
-msgstr ""
-
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12119,160 +12228,160 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla namei(1).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "gettimeofday epäonnistui"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "varattuja semaforeja = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "virhe: UUID:n jäsennys epäonnistui"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "siirtyminen epäonnistui"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "varattuja semaforeja = %d\n"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "gettimeofday epäonnistui"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: tunnistamaton virransäästötila ”%s”\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: avaaminen epäonnistui: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: oletetaan RTC:n käyttävän UTC:tä...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Käytetään UTC-aikaa.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Käytetään paikallista aikaa.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s: herätysaika on annettava\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s ei ole lp-laite.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "lukeminen epäonnistui: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12330,16 +12439,16 @@ msgstr ""
 "%s: %s\n"
 "Komento ”%s --help” antaa lisää tietoa.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: Tunnistamaton arkkitehtuuri"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Liian vähän argumentteja"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "Osion kirjoitus epäonnistui laitteelle %s"
@@ -12424,24 +12533,21 @@ msgstr "%s käyttää IRQ:ta %d\n"
 msgid "%s using polling\n"
 msgstr "%s käyttää kiertokyselyä\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "Käyttö: %s [valitsimet] <ohjelma> [arg...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12449,150 +12555,150 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla unshare(1).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "siirtyminen epäonnistui"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: ryhmä-id:tä voi asettaa: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: käyttäjä-id:tä ei voi asettaa: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: ohjelmaa %s ei voi käynnistää: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "virhe: vaihda työhakemistoksi %s."
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: prosessia ”%s” ei löydy\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: ohjelmaa %s ei voi käynnistää: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "Puskuria ei voi varata.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "virheellinen aikakatkaisuarvo: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Liian vähän argumentteja"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "Puskuria ei voi varata.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "virheellinen nopeus: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "liian monta vaihtoehtoista nopeutta"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: ei voi avata vakiosyötteenä: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ei ole merkkilaite"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: ei ole avoin lukua/kirjoitusta varten"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: ongelma tiedostokahvan kopioinnissa: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "tyyppi: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: luku: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: syötteen ylivuoto"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12604,72 +12710,66 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "käyttäjä"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "käyttäjää"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Käyttö: %s [valitsimet]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "siirtyminen epäonnistui"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "stat epäonnistui: %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "on y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "on n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "varattuja semaforeja = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "virheellinen id: %s\n"
@@ -12685,52 +12785,46 @@ msgstr ""
 "Käytä ”%s [valitsimet] %s” jos todella haluat käyttää sitä.\n"
 "Skriptiä ei käynnistetty.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "Tiedostoa ”%s” ei voi avata"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skripti käynnistetty, tiedosto on %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Skripti käynnistetty %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: tiedostolle %s ei löydy laitetta\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12739,79 +12833,76 @@ msgstr ""
 "\n"
 "Skripti suoritettu %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skripti suoritettu, tiedosto on %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty epäonnistui\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Pty:t lopussa\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "kirjoittaminen vakiotulosteeseen epäonnistui"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "segmenttejä enintään = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "Tiedostoa ”%s” ei voi avata"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() ei onnistunut lukemaan aikaa kohteesta %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: %s: odottamaton tiedostomuoto\n"
@@ -12822,50 +12913,47 @@ msgid "Argument error."
 msgstr "%s: Argumenttivirhe, käyttö\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12874,61 +12962,61 @@ msgstr ""
 "\n"
 "Lisätietoja manuaalisivulla wipefs(8).\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "haarauttaminen ei onnistu"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "haarauttaminen ei onnistu"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "laitetta %s ei voi avata\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "virransäästötilaa ei voi asettaa (pois)\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "laitetta %s ei voi avata kirjoitusta varten\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl-virhe: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Virhe kirjoitettaessa näyttövedosta\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Tiedostoa %s ei voitu avata\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM ei ole määritelty.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: tuntematon signaali %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12956,146 +13044,151 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "virheellinen valitsin"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "virheellinen aikakatkaisuarvo: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: väliaikaistiedostoa ei voi avata.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: käyttäjä-id:tä ei voi asettaa: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Levyn kokoa ei voi hakea"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Yleislähetysviesti käyttäjältä %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: ei lueta tiedostoa %s – käytä vakiosyötettä.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s epäonnistui.\n"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "lukeminen epäonnistui: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Käyttö: %s [valitsimet] polku [polku ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: tty:si nimeä ei löydy\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: sinulla ei ole kirjoitusoikeutta.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s ei ole kirjautuneena päätteellä %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s on estänyt viestit päätteellä %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s ei ole kirjautuneena\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s ei vastaanota viestejä\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr ""
 "write: %s on kirjautuneena useammin kuin kerran; kirjoitetaan kohteeseen %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Syöterivi on liian pitkä.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
 "Viesti %4$s:lle kirjautuneelta käyttäjältä %1$s@%2$s (%3$s), kello %5$s..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Viesti %3$s:lle kirjautuneelta käyttäjältä %1$s@%2$s, kello %4$s..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc epäonnistui"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Käyttö: %s [valitsimet]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13279,7 +13372,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13483,7 +13576,7 @@ msgstr ""
 "\n"
 "Hahmoa ei löydy\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Hahmoa ei löydy"
 
@@ -13548,7 +13641,7 @@ msgstr "hexdump: virheellinen muoto {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: virheellinen muunnosmerkki %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13576,7 +13669,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13584,81 +13677,81 @@ msgstr ""
 "%s: Käyttö: %s [-number] [-p merkkijono] [-cefnrs] [+rivi] [+/hahmo/] "
 "[tiedostot]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: valitsin vaatii argumentin – %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: virheellinen valitsin – %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...ohitetaan eteenpäin\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...ohitetaan taaksepäin\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Ei seuraavaa tiedostoa"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Ei edellistä tiedostoa"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Lukuvirhe tiedostosta %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Odottamaton tiedoston loppu (EOF) tiedostossa %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Tuntematon virhe tiedostossa %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Väliaikaistiedostoa ei voi luoda\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Virhe säännöllisessä lausekkeessa: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(tiedoston loppu)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Ei muistettua hakumerkkijonoa"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Ei voi avata "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "tallennettu"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !-komento ei ole sallittu rajoitetussa tilassa.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() epäonnistui, yritä myöhemmin uudelleen\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Seuraava tiedosto: "
 
@@ -13728,8 +13821,8 @@ msgstr "Käyttö: %s [valitsimet] laite ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13745,39 +13838,150 @@ msgstr "%s: avaaminen epäonnistui: %s\n"
 msgid "no input file specified"
 msgstr "Valitsinta --date ei ole annettu.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Käyttö: %s [valitsimet] laite ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "ongelma luettaessa terminfoa"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Tuntematon ohjaussarja syötteessä: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Syöterivi on liian pitkä.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Käyttö:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Virhe suljettaessa tiedostoa\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Valitettavasti vain ei-tyhjien osioiden lippua voi muuttaa.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Varoitus: osio %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Varoitus: osiot %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "ja %s ovat päällekkäiset\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Käyttö: %s [valitsimet] laite ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "laite: esimerkiksi /dev/hda tai /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "tavut"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Käyttö:\n"
+#~ " %1$s -a [-e] [-v]                  ota käyttöön kaikki /etc/fstabin\n"
+#~ "                                     sivutusalueet\n"
+#~ " %1$s [-p priorit.] [-v] <polku>    ota käyttöön annettu sivutusalue\n"
+#~ " %1$s -s                            näytä yhteenveto sivutuskäytöstä\n"
+#~ " %1$s -h                            näytä ohje\n"
+#~ " %1$s -V                            näytä versio\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Käyttö:\n"
+#~ " %1$s -a [-v]                      poista käytöstä kaikki sivutusalueet\n"
+#~ " %1$s [-v] <polku>               poista käytöstä annettu sivutusalue\n"
+#~ " %1$s -h                           näytä ohje\n"
+#~ " %1$s -V                           näytä versio\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Käyttö: %s [valitsimet] <tiedostonimi>\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Käyttö: %s [valitsimet]\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Käyttö: %s [valitsimet] <tiedostonimi>\n"
+#~ "\n"
+#~ "Valitsimet:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Käyttö: %s [valitsimet] laite ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13919,26 +14123,10 @@ msgstr "Syöterivi on liian pitkä.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [tai --help]:     näytä tämä viesti"
 
-#~ msgid "dangerous options:"
-#~ msgstr "vaaralliset valitsimet:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g [tai --show-geometry]: näytä ytimen käsitys geometriasta"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [tai --show-pt-geometry]: näytä osiotausta päätelty geometria"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [tai --show-extended]: listaa myös laajennetut osiot tulosteessa\n"
-#~ "                             tai odota syötteestä niiden kahvoja"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -13998,55 +14186,9 @@ msgstr "Syöterivi on liian pitkä.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [valitsimet] [--] valitsinmerkkijono parametrit\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [valitsimet] -o|--options valitsinmerkkijono [valitsimet] "
-#~ "[--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              parametrit\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Salli pitkien valitsimien alkaminen "
-#~ "yhdellä -:lla\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Tämä pieni käyttöopas\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=valitsimet Pitkät tunnistettavat valitsimet\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=ohjelmanimi       Nimi, joka ilmoitetaan virheiden "
-#~ "yhteydessä\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=valitsimet     Lyhyet tunnistettavat valitsimet\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Vaienna getopt(3):n virheilmoitukset\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Ei normaalia tulostetta\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr "  -s, --shell=kuori            Aseta kuoren lainauskäytännöt\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                  Testaa getopt(1):n versio\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unquote                Ei lainausmerkkejä tulosteeseen\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Näytä versiotiedot\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (parannettu) 1.1.4\n"
 
diff --git a/po/fr.po b/po/fr.po
index 06dee466d..7152a12df 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.19-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2011-05-14 22:23-0400\n"
 "Last-Translator: David Prévot <david@tilapin.org>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -110,29 +110,29 @@ msgstr "relire la table de partitions"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "afficher la capacité en secteurs de 512 octets"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "impossible d'ouvrir %s"
@@ -214,7 +214,7 @@ msgid "Verifying ... "
 msgstr "Vérification en cours… "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Impossible d'ouvrir le fichier « %s »"
@@ -254,15 +254,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -275,7 +275,7 @@ msgstr "%s de %s\n"
 msgid "cannot stat file %s"
 msgstr "impossible d'évaluer par stat() le périphérique %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, c-format
 msgid "%s: not a block device"
@@ -324,8 +324,8 @@ msgid "stat failed: %s"
 msgstr "échec de « stat » : %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "échec d'ouverture : %s"
@@ -552,57 +552,57 @@ msgstr "index de données du fichier non valable"
 msgid "compiled without -x support"
 msgstr "compilé sans prise en charge de -x"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s : OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Utilisation : %s [-larvsmf] /dev/nom\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s est monté.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Voulez-vous vraiment continuer ?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "vérification annulée.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zone nr < valeur de PREMIERE_ZONE dans le fichier « %s »."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zone nr >= valeur de ZONES dans le fichier « %s »."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Suppression du bloc"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr ""
 "Erreur de lecture : impossible de se positionner sur un bloc du fichier "
 "« %s »\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Erreur de lecture : bloc corrompu dans le fichier « %s »\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -611,300 +611,300 @@ msgstr ""
 "Erreur interne : tentative d'écriture d'un bloc corrompu\n"
 "Requête d'écriture ignorée\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "échec de positionnement dans write_block (écriture de bloc)"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Erreur d'écriture : bloc corrompu dans le fichier « %s »\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr ""
 "échec de positionnement pendant l'écriture du superbloc (write_super_block)"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "impossible d'écrire le superbloc"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Impossible d'écrire la table des inœuds"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Impossible d'écrire la table des zones"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Impossible d'écrire des inœuds"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "échec de positionnement"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "Impossible d'allouer un tampon au superbloc"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "Impossible de lire le superbloc"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "nombre magique corrompu dans le superbloc"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Seuls les blocs d'1 ko par zone sont pris en charge"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "champ s_imap_blocks corrompu dans le superbloc"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "champ s_zmap_blocks corrompu dans le superbloc"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Impossible d'allouer un tampon pour la table des inœuds"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Impossible d'allouer un tampon pour la table de zones"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Impossible d'allouer un tampon pour les inœuds"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Impossible d'allouer un tampon pour le compteur d'inœuds"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Impossible d'allouer un tampon pour le compteur de zones"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Impossible de lire la table des inœuds"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Impossible de lire la table de zones"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Impossible de lire les inœuds"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Avertissement : Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inœuds\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocs\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Taille_zone=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Taille_maximale=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "État du système de fichiers=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "longueur_noms=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inœud %d marqué libre, mais utilisé pour le fichier « %s »\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Marquer utilisé"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Le fichier « %s » a pour mode %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Avertissement : compte d'inœuds trop grand.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "l'inœud de la racine n'est pas un répertoire"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Bloc utilisé auparavant. Maintenant inclus dans le fichier « %s »."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Libre"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Bloc %d dans le fichier « %s » marqué non utilisé."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Correct"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "Le répertoire « %s » contient un numéro d'inœud corrompu pour le fichier "
 "« %.*s »."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Enlever"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s : répertoire corrompu : « . » n'apparaît pas en premier\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s : répertoire corrompu : « .. » n'apparaît pas en second\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "erreur interne"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s : répertoire corrompu : taille < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "échec de positionnement dans bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Mode %d de l'inœud non réinitialisé."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inœud %d non utilisé, marqué utilisé dans la table."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inœud %d utilisé, marqué inutilisé dans la table."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Initialisé"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inœud %d (mode = %07o), i_nlinks=%d, décompte=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Initialisation de i_nlinks pour décompte"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zone %d : marquée utilisée, aucun fichier ne l'utilise."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Non marqué"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zone %d : utilisée, décompte=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zone %d : non utilisée, décompte=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "taille d'inœud corrompue"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "taille d'inœud v2 corrompue"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr ""
 "il est nécessaire d'utiliser un terminal pour des réparations en mode "
 "interactif"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "impossible d'ouvrir « %s » : %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s est propre, aucune vérification.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Vérification forcée du système de fichiers sur %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 "Le système de fichiers de %s est corrompu, une vérification est nécessaire.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -913,12 +913,12 @@ msgstr ""
 "\n"
 "%6ld inœuds utilisés (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones utilisées (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -941,7 +941,7 @@ msgstr ""
 "------\n"
 "%6d fichiers\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1067,7 +1067,7 @@ msgstr "trop d'inœuds - le maximum est 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "pas assez d'espace, au moins %llu blocs sont nécessaires"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Périphérique : %s\n"
@@ -1244,10 +1244,8 @@ msgstr "%6.2f%% (%+ld octets)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Erreur de fermeture du fichier\n"
+msgid "cannot close file %s"
+msgstr "Impossible d'ouvrir le fichier « %s »"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1361,89 +1359,99 @@ msgstr ""
 "Attention : numéros de périphériques tronqués à %u bits. Cela signifie\n"
 "très probablement que certains fichiers de périphériques seront erronés.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr ""
 "Utilisation : %s [-c | -l nom-de-fichier] [-nXX] [-iXX] /dev/nom [blocs]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s est monté ; impossible de créer un système de fichier ici !"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "échec de positionnement du bloc d'amorçage dans write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "impossible de vider le secteur d'amorçage"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "échec de positionnement dans write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "impossible d'écrire le superbloc"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "impossible d'écrire la table des inœuds"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "impossible d'écrire la table des zones"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "impossible d'écrire les inœuds"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "échec de positionnement dans write_block (écriture de bloc)"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "échec d'écriture dans write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "trop de blocs corrompus"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "pas assez de blocs valables"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "Impossible d'allouer un tampon au superbloc"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "impossible d'allouer des tampons pour les tables"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "impossible d'allouer un tampon pour les inœuds"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inœuds\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blocs\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1452,99 +1460,99 @@ msgstr ""
 "Taille maximale=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "échec de positionnement pendant le test des blocs"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valeurs étranges dans do_check : probablement un bogue\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "échec de positionnement dans check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "blocs corrompus avant la zone de données : création de système de fichiers "
 "impossible"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocs corrompus\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "un bloc corrompu\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "impossible d'ouvrir le fichier de blocs corrompus"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "numéro de bloc corrompu erroné en entrée à la ligne %d\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "impossible de lire le fichier de blocs corrompus"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "taille d'inœud corrompue"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "erreur strtol : nombre de blocs non indiqué"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s : échec de fonction « stat »"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s : échec d'ouverture"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s : %s : le périphérique est occupé"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "taille de bloc plus petite que la taille du secteur physique %s"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "impossible d'obtenir la taille de %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "abandon de la création d'un système de fichiers sur « %s »"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "nombre de blocs trop petit"
@@ -1893,7 +1901,7 @@ msgstr "L'étiquette est trop longue. Tronquée à « %s »"
 msgid "%s: failed to write label"
 msgstr "%s : impossible d'écrire l'étiquette"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2245,7 +2253,7 @@ msgid "   Logical"
 msgstr "   Logique"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -2918,12 +2926,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Commande d'étiquetage BSD (m pour l'aide): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Premier %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Dernier %s ou +taille or +tailleM ou +tailleK"
@@ -3070,7 +3078,7 @@ msgid "tracks/cylinder"
 msgstr "pistes/cylindre"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cylindres"
 
@@ -3137,12 +3145,12 @@ msgstr "Le nombre maximum de partitions a été créé\n"
 msgid "This partition already exists.\n"
 msgstr "Cette partition existe déjà.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Avertissement : trop de partitions (%d, maxi %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3361,7 +3369,7 @@ msgstr "Vous devez initialiser"
 msgid "heads"
 msgstr "têtes"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "secteurs"
 
@@ -3813,7 +3821,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Amorce  Début        Fin      Blocs     Id  Système\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Périphérique"
 
@@ -3898,7 +3906,7 @@ msgstr "Total de secteurs alloués %llu supérieur au maximum %llu\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld secteurs de %d octets non alloués restant\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "La partition %d est déjà définie. Détruisez-là avant de l'ajouter.\n"
@@ -4057,39 +4065,39 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Synchronisation des disques.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partition %d n'a pas de zone de données\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nouveau début de données"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Commande pour experts (m pour de l'aide): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Nombre de cylindres"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Nombre de têtes"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Nombre de secteurs"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Avertissement : initialisation du décalage de secteur pour compatibilité "
 "DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4103,32 +4111,32 @@ msgstr ""
 "Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Le disque %s ne contient pas une table de partitions valable\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossible d'ouvrir %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c : commande inconnue\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Ce noyau trouve lui-même la taille des secteurs - option -b ignorée\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4137,18 +4145,18 @@ msgstr ""
 "Avertissement : l'option -b (initialiser la taille de secteur) doit être "
 "utilisée avec un périphérique indiqué\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Détection d'une étiquette de disque OSF/1 sur %s, passage en mode d'édition "
 "d'étiquette.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Commande (m pour l'aide): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4157,16 +4165,16 @@ msgstr ""
 "\n"
 "Le fichier d'amorçage actuel est : %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "veuillez saisir le nom du nouveau fichier d'amorçage : "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Fichier d'amorçage non modifié\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4491,9 +4499,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVous avez choisi un nom de fichier d'amorce inhabituel.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Désolé, vous devriez modifier l'étiquette des partitions non vides.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Désolé, seul le superutilisateur peut modifier l'horloge système.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4511,7 +4519,7 @@ msgstr ""
 "Taper OUI si vous êtes certain de l'étiquetage différent de cette "
 "partition.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "OUI\n"
 
@@ -4719,7 +4727,7 @@ msgstr "Espace intermédiaire inutilisé - secteurs 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Espace intermédiaire inutilisé - secteurs %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4728,7 +4736,7 @@ msgstr ""
 "D'autres partitions couvrent déjà le disque entier.\n"
 "En détruire/réduire quelques-unes avant de réessayer.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4737,12 +4745,12 @@ msgstr ""
 "Il est fortement recommandé que la troisième partition couvre le\n"
 "disque en entier et soit de type « Tout le disque »\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Le secteur %d est déjà alloué\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4753,7 +4761,7 @@ msgstr ""
 "mais la valeur %d %s en couvre d'autres. Votre entrée a été modifiée\n"
 "à %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4763,7 +4771,7 @@ msgstr ""
 "laisser cette\n"
 "partition comme disque entier (5), débutant à 0, avec %u secteurs\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4781,7 +4789,7 @@ msgstr ""
 "(partition d'échange Linux) : "
 
 # fdisk/fdisksunlabel.c:656
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4802,7 +4810,7 @@ msgstr ""
 "Unités = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4815,28 +4823,28 @@ msgstr ""
 "Unités = %s de %d * 512 octets\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Drapeau Début       Fin    Blocs    Id  Système\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Nombre de cylindres alternatifs"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Secteurs additionnels par cylindre"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Facteur « interleave »"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Vitesse de rotation (tour par minute)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Nombre de cylindres physiques"
 
@@ -5296,7 +5304,7 @@ msgstr "Disque %s : impossible d'obtenir la géométrie\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disque %s : impossible d'obtenir sa taille\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5307,23 +5315,23 @@ msgstr ""
 "un disque entier. Utiliser fdisk n'aurait probablement pas de sens.\n"
 "[Utiliser l'option --force si vous désirez faire cela]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Avertissement : HDIO_GETGEO indique qu'il a %lu têtes\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Avertissement : HDIO_GETGEO indique qu'il y a %lu secteurs\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "Avertissement : BLKGETSIZE/HDIO_GETGEO indique qu'il y a %lu cylindres\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5333,7 +5341,7 @@ msgstr ""
 "Cela créera des problèmes avec les logiciels qui utilisent un adressage C/H/"
 "S.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5342,7 +5350,7 @@ msgstr ""
 "\n"
 "Disque %s : %lu cylindres, %lu têtes, %lu secteurs/piste\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5350,7 +5358,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour la tête : %lu (devrait "
 "être 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5359,7 +5367,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour le secteur : %lu (devrait "
 "être 1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5368,7 +5376,7 @@ msgstr ""
 "%s de la partition %s a une valeur impossible pour les cylindres : %lu "
 "(devrait être 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5377,12 +5385,12 @@ msgstr ""
 "Id  Nom\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Relecture de la table de partitions…\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5392,26 +5400,26 @@ msgstr ""
 "Exécutez partprobe(8), kpartx(8) ou redémarrez le système\n"
 "maintenant, avant d'utiliser mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erreur de fermeture %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s : pas de telle partition\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "format non reconnu - utilisation des secteurs\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format non implanté - %s utilisé\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5421,12 +5429,12 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Périph Amor Début     Fin   #cyls    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5435,12 +5443,12 @@ msgstr ""
 "Unités= secteurs de 512 octets, décompte à partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Périph Amorce  Début       Fin   #secteurs Id  Système\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5449,12 +5457,12 @@ msgstr ""
 "Unités= blocs de 1024 octets, décompte à partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Périph Amorce Début       Fin    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5464,31 +5472,31 @@ msgstr ""
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Périph Amor Début   Fin     Mo    #blocs    Id  Système\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tdébut : (c,h,s) attendu (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tfin : (c,h,s) attendu (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partition se termine sur le cylindre %ld, après la fin du disque\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Aucune partition repérée\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5499,54 +5507,44 @@ msgstr ""
 "  pour C/H/S=*/%ld/%ld (au lieu de %ld/%ld/%ld).\n"
 "Pour ce rapport, cette géométrie sera supposée telle.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "aucune table de partitions présente.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "étrange, seulement %d partitions définies.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Avertissement : partition %s de taille 0 mais non marquée vide (« Empty »)\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Avertissement : partition %s de taille 0 et amorçable\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Avertissement : partition %s de taille 0 avec une adresse de début non à "
 "zéro\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Avertissement : partition %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "n'est pas contenu(e) dans la partition %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Avertissement : partitions %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "et %s se chevauchent\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Avertissement : la partition %d est vide\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5556,17 +5554,17 @@ msgstr ""
 "partitions\n"
 "(secteur %lu), et cela la détruira lorsqu'elle se remplira\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Avertissement : la partition %s débute au secteur 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Avertissement : la partition %s s'étend après la fin du disque\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5574,20 +5572,20 @@ msgstr ""
 "Parmi les partitions primaires, au plus une seule peut être étendue\n"
 " (quoique cela ne soit pas un problème sous Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 "Avertissement : la partition %s ne débute pas sur une frontière de cylindre\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 "Avertissement : la partition %s ne se termine pas sur une frontière de "
 "cylindre\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5596,7 +5594,7 @@ msgstr ""
 "Cela n'est pas d'important pour LILO, mais DOS MBR n'amorcera pas sur ce "
 "disque.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5604,7 +5602,7 @@ msgstr ""
 "Avertissement : habituellement on ne peut amorcer qu'à partir d'une\n"
 "partition primaire. LILO ne s'occupe pas du drapeau d'amorçage.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5612,33 +5610,33 @@ msgstr ""
 "Avertissement : aucune partition primaire marquée amorçable (active)\n"
 "Peu important pour LILO, mais DOS MBR n'amorcera pas ce disque.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "début"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s : début : (c,h,s) attendu (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "fin"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s : fin : (c,h,s) attendu (%ld,%ld,%ld) trouvé (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s terminant sur le cylindre %ld, après la fin du disque\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5647,7 +5645,7 @@ msgstr ""
 "Avertissement : décalage du début de partition étendue de %ld à %ld\n"
 "(pour fins d'affichage seulement. Ne modifie pas le contenu.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5655,133 +5653,133 @@ msgstr ""
 "Avertissement : la partition étendue ne débute pas sur une frontière de\n"
 "cylindres. DOS et Linux interpréteront les contenus différemment.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "trop de partitions - celles au-delà de nr (%d) sont ignorées\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "arbre de partitions ?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gestionnaire de disque détecté - impossible de gérer cela\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "signature DM6 repérée - abandon\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "bizarre… une partition étendue de taille nulle ?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "bizarre… une partition BSD de taille nulle ?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s : type non reconnu de table de partition\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "option -n utilisée : rien n'a changé\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Échec de sauvegarde des vieux secteurs - abandon\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Échec de l'écriture de la partition sur %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "ligne d'entrée longue ou incomplète - abandon\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erreur d'entrée : « = » attendu après le champ %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erreur d'entrée : caractère inattendu %c après le champ %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrée non reconnue : %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "nombre trop grand\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "rebut après le nombre\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "aucun espace pour le descripteur de partition\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "ne peut construire autour de la partition étendue\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "trop de champs à l'entrée\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Aucun espace pour en accepter davantage\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Type incorrect\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Avertissement : la taille donnée (%lu) excède la taille maximale allouable "
 "(%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Avertissement : partition vide\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Avertissement : début de partition corrompu (auparavant %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "drapeau d'amorçage non reconnu - choisir « - » ou « * »\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "spécification c,h,s partielle ?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Partition étendue par à l'endroit attendu\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "entrée erronée\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "trop de partitions\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5793,104 +5791,187 @@ msgstr ""
 "Vous n'avez normalement besoin d'indiquer que <début> et <taille> (et "
 "parfois <type>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
+msgstr "Utilisation :\n"
+
+#: fdisk/sfdisk.c:2332
+#, fuzzy, c-format
+msgid " %s [options] <device> [...]\n"
 msgstr ""
 "\n"
 "Utilisation : \n"
 " %s [options] [<périphérique> ...]\n"
 
-#: fdisk/sfdisk.c:2355
-#, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "périphérique : quelque chose comme /dev/hda ou /dev/sda"
-
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Options :\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "options dangereuses :"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [ou --show-pt-geometry] : afficher la géométrie estimée\n"
+"                                 à partir de la table de partitions"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [ou --show-extended] :    afficher aussi les partitions étendues en "
+"sortie\n"
+"                                 ou les descripteurs attendus en entrée pour "
+"elles"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Utilisation :"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s périphérique\t\t afficher les partitions actives du périphérique\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s périphérique n1 n2 ... activer les partitions n1 ..., désactiver les "
 "autres\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An périphérique\t activer la partition n, désactiver les autres\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5904,62 +5985,62 @@ msgstr ""
 "Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Utiliser l'option --force pour ignorer ce contrôle.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "pas de commande ?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "total : %llu blocs\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Utilisation : sfdisk --print-id périphérique numéro-de-partition\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Utilisation : sfdisk --change-id périphérique numéro-de-partition Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Utilisation : sfdisk --id périphérique numéro-de-partition [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "vous ne pouvez indiquer qu'un périphérique (sauf avec -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "ne peut ouvrir %s en lecture/écriture\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "ne peut ouvrir %s en lecture\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s : %ld cylindres, %ld têtes, %ld secteurs/piste\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Ne peut obtenir la taille de %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "octet actif erroné : 0x%x au lieu de 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5967,7 +6048,7 @@ msgstr ""
 "Terminé\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5977,35 +6058,35 @@ msgstr ""
 "mais en a un pour DOS MBR qui ne pourra amorcer un disque qu'avec une seule "
 "partition active.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partition %s a un identifiant %x et n'est pas masquée\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Identificateur erroné %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Le disque est présentement en usage.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erreur fatale : impossible de trouver %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Avertissement : %s n'est pas un périphérique bloc\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Vérification qu'aucun autre n'utilise le disque en ce moment \n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -6019,30 +6100,30 @@ msgstr ""
 "swapoff) toutes les partition d'échange de ce disque.\n"
 "Utiliser l'option --no-reread pour supprimer cette vérification.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utiliser l'option --force pour annuler toutes les vérifications.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Précédente situation :\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partition %d n'existe pas, ne peut la modifier\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Nouvelle situation :\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -6050,23 +6131,23 @@ msgstr ""
 "Ces partitions sont discutables -- rien n'a changé.\n"
 "(Si vous désirez cela, utiliser l'option --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 "Cette situation n'est pas recommandable -- vous devriez probablement "
 "répondre Non\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Êtes-vous satisfait avec cela ? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Voulez-vous écrire cela sur le disque ? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -6075,16 +6156,16 @@ msgstr ""
 "\n"
 "sfdisk : fin prématurée de l'entrée\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Abandon - rien n'a changé\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Veuillez répondre « y », « n » ou « q »\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6093,7 +6174,7 @@ msgstr ""
 "Succès d'écriture de la nouvelle table de partitions\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6125,25 +6206,27 @@ msgstr "Verrouillage du disque %s… "
 msgid "(waiting) "
 msgstr "(en attente) "
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr "succès"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s a réussi.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 msgid "failed"
 msgstr "échec"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "Attention : impossible d'ouvrir %s : %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "Attention : mauvais format à la ligne %d sur %s\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -6155,37 +6238,37 @@ msgstr ""
 "corriger cela au plus tôt dans le fichier /etc/fstab.\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck : %s : non trouvé\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s : attente : plus de processus enfant ?\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "Avertissement… %s, périphérique %s, signal de fin %d.\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s %s : statut %x, cela ne devrait pas arriver.\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Fin de %s (code de retour %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s : erreur %d lors de l'exécution de fsck.%s pour %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6194,7 +6277,7 @@ msgstr ""
 "Tous les types de systèmes de fichiers précisés par -t, ou bien aucun,\n"
 "doivent être préfixés par « no » (non) ou « ! ».\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
@@ -6202,12 +6285,12 @@ msgstr ""
 "%s : mauvaise ligne dans /etc/fstab ignorée : montage avec nombre de passes "
 "fsck non nul\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s : périphérique inexistant ignoré\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
@@ -6216,21 +6299,21 @@ msgstr ""
 "%s : périphérique inexistant (l'option « nofail » de fstab peut servir à "
 "ignorer ce périphérique)\n"
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck : impossible de contrôler %s, fsck.%s non trouvé\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "Contrôle de tous les systèmes de fichiers.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--en attente-- (passe %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6240,60 +6323,60 @@ msgstr ""
 "\n"
 "Utilisation : %s [options] [fichier ...]\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s : périphériques trop nombreux\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Ne peut ouvrir %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "/proc est-il monté ?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr ""
 "Vous devez être superutilisateur pour rechercher le type de systèmes de "
 "fichiers : %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Impossible de trouver un système de fichiers correspondant : %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s : trop d'arguments\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 #, fuzzy
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
@@ -6315,33 +6398,89 @@ msgstr "option longue vide après l'argument -l ou --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "shell inconnu après l'argument -s ou --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [options] -o|--options chaine d'options [options] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            permettre les options de forme longue avec un "
+"simple -\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   afficher l'aide mémoire\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr ""
+"  -l, --longoptions=opt-long   reconnaîtres les options de forme longue\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=nom-de-programme le nom sous lequel les erreurs sont "
+"rapportées\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr ""
+"  -o, --options=chaîne-opt    reconnaître les options de forme courte\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  désactiver les rapports d'erreur par getopt"
+"(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           pas d'affichage normal\n"
+
+# getopt-1.1.2/getopt.c:335
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=shell            initialiser la convention de commentaire du "
+"shell\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   afficher la version de getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr ""
+"  -u, --unqote                 ne pas commenter avec des guillemets la "
+"sortie\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                afficher la version\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "la chaîne d'options de l'argument est manquante"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "erreur interne, contacter l'auteur."
 
@@ -6830,94 +6969,112 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Impossible d'initialiser la valeur d'époque dans le kernel.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Options :\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       indique à hwclock le type d'alpha utilisé (consultez hwclock(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s : impossible de se connecter au système d'audit\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "impossible d'analyser ce PID"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s ne peut pas prendre des arguments d'options qui n'en sont pas. Vous avez "
 "fourni %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6926,7 +7083,7 @@ msgstr ""
 "Vous avez indiqué plusieurs fonctions.\n"
 "Vous ne pouvez en exécuter qu'une à la fois.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6935,7 +7092,7 @@ msgstr ""
 "%s : les options --utc et --localtime sont mutuellement exclusives. Vous "
 "avez indiqué les deux.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6944,7 +7101,7 @@ msgstr ""
 "%s : les options --adjust et --noadjfile sont mutuellement exclusives. Vous "
 "avez indiqué les deux.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6953,28 +7110,28 @@ msgstr ""
 "%s : les options --adjfile et --noadjfile sont mutuellement exclusives. Vous "
 "avez indiqué les deux.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s : avec --noadjfile, vous devez indiquer soit --utc ou --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 "Pas utilisable pour initialiser l'heure. Ne peut initialiser l'horloge.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Désolé, seul le superutilisateur peut modifier l'horloge matérielle.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Désolé, seul le superutilisateur peut modifier l'horloge système.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6982,13 +7139,13 @@ msgstr ""
 "Désole, seul le superutilisateur peut modifier l'époque de l'horloge "
 "matérielle dans le kernel.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "Ne peut accéder l'horloge matérielle par le biais d'une méthode connue.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7183,7 +7340,7 @@ msgid "failed to read mtab"
 msgstr "échec de lecture : %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr "impossible d'initialiser l'itérateur libmount"
 
@@ -7230,100 +7387,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
-"\n"
-"Options :\n"
-" -a, --all               monter tous les systèmes de fichiers indiqués dans "
-"fstab\n"
-" -f, --fake              répétition, sauter l'appel système mount(2)\n"
-" -F, --fork              bifurquer pour chaque périphérique (utiliser avec -"
-"a)\n"
-" -h, --help              cette aide\n"
-" -n, --no-mtab           ne pas écrire dans /etc/mtab\n"
-" -r, --read-only         monter le  système de fichiers en lecture seule "
-"(comme -o ro)\n"
-" -v, --verbose           mode bavard\n"
-" -V, --version           afficher la version\n"
-" -w, --read-write        monter le système de fichiers en lecture/écriture "
-"(par défaut)\n"
-" -o, --options <liste>   chaîne séparée par des virgules d'options de "
-"montage\n"
-" -O, --test-opts <liste> limiter le jeu de systèmes de fichiers (utiliser "
-"avec -a)\n"
-" -t, --types <liste>     indiquer le type de système de fichiers\n"
-" -c, --no-canonicalize   ne pas canoniser les chemins\n"
-" -i, --internal-only     ne pas appeler les assistants mount.<type>\n"
-" -l, --show-labels       afficher la liste de tous les montages avec les "
-"étiquettes\n"
-"\n"
-"Source :\n"
-" -L, --label <étiquette> synonyme de LABEL=<étiquette>\n"
-" -U, --uuid <uuid>       synonyme de UUID=<uuid>\n"
-" LABEL=<étiquette>       indiquer le périphérique par étiquette de système "
-"de fichiers\n"
-" UUID=<uuid>             indiquer le périphérique par UUID de système de "
-"fichiers\n"
-" <périphérique>          indiquer le périphérique par chemin\n"
-" <répertoire>            point de montage pour remontages (consultez --bind/"
-"rbind)\n"
-" <fichier>               fichier régulier pour configuration de périphérique "
-"boucle\n"
-"\n"
-"Opérations :\n"
-" -B, --bind              monter un sous-répertoire ailleurs (comme -o bind)\n"
-" -M, --move              déplacer un sous-répertoire ailleurs\n"
-" -R, --rbind             monter un sous-répertoire et tous les sous-montages "
-"ailleurs\n"
-" --make-shared           marquer un sous-répertoire comme partagé\n"
-" --make-slave            marquer un sous-répertoire comme esclave\n"
-" --make-private          marquer un sous-répertoire comme privé\n"
-" --make-unbindable       marquer un sous-répertoire comme non remontable\n"
-" --make-rshared          marquer récursivement un sous-répertoire complet "
-"comme partagé\n"
-" --make-rslave           marquer récursivement un sous-répertoire complet "
-"comme esclave\n"
-" --make-rprivate         marquer récursivement un sous-répertoire complet "
-"comme privé\n"
-" --make-runbindable      marquer récursivement un sous-répertoire complet "
-"comme non remontable\n"
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, c-format
 msgid ""
 "\n"
@@ -7332,25 +7474,25 @@ msgstr ""
 "\n"
 "Consultez mount(8) pour obtenir des renseignements complémentaires.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr "échec d'allocation de contexte libmount"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 msgid "failed to append options"
 msgstr "impossible d'ajouter des options"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 msgid "failed to set options pattern"
 msgstr "impossible de configurer les options de motif"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 #, fuzzy
 msgid "only one <source> may be specified"
 msgstr "une seule <source> peut être indiquée"
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 msgid "failed to allocate source buffer"
 msgstr "impossible d'allouer le tampon source"
 
@@ -7434,7 +7576,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s : échec de connexion PAM, fin d'exécution : %s"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Mot de passe : "
 
@@ -7876,46 +8018,47 @@ msgstr "Nombre excessif de sauts de page (linefeeds)"
 msgid "too many bare linefeeds."
 msgstr "trop de sauts de page (linefeeds)."
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr "Expiration du délai après %d secondes"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Dernière connexion : %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "à partir de %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "sur %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 msgid "write lastlog failed"
 msgstr "échec d'écriture de lastlog"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "Échec de connexion à partir de %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "Échec de connexion sur %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d échecs de connexion à partir de %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d échecs de connexion sur %s, %s"
@@ -7940,7 +8083,7 @@ msgstr "permission refusée"
 msgid "setuid failed"
 msgstr "échec de setuid"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "échec de exec %s"
@@ -7987,8 +8130,8 @@ msgstr ""
 "%s : impossible de déverrouiller %s : %s (vos modifications sont encore dans "
 "%s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "échec de la fonction « fork »"
 
@@ -8040,24 +8183,21 @@ msgstr "valeur d'année incorrecte : utilisez 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Utilisation : %s [-13smjyV] [[[jour] mois] année]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -8167,32 +8307,32 @@ msgstr " Enlever"
 msgid "failed to add line to output"
 msgstr "impossible d'ajouter une ligne à la sortie"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, c-format
 msgid "%s: parse error at line %d"
 msgstr "%s : erreur d'analyse à la ligne %d"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "impossible d'initialiser la tab libmount"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "impossible de lire %s."
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "impossible d'initialiser la tab libmount"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "échec de malloc()"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8209,77 +8349,67 @@ msgstr ""
 " %1$s [options] <périphérique> <pointdemontage>\n"
 " %1$s [options] [--source <périphérique>] [--target <pointdemontage>]\n"
 
-#: misc-utils/findmnt.c:770
-#, fuzzy, c-format
+#: misc-utils/findmnt.c:772
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
-"\n"
-"Options :\n"
-" -s, --fstab            rechercher dans la table statique des systèmes de "
-"fichiers\n"
-" -m, --mtab             rechercher dans la table des systèmes de fichiers "
-"montés\n"
-" -k, --kernel           rechercher dans la table du noyau des systèmes de "
-"fichiers\n"
-"                        montés (par défaut)\n"
-"\n"
-" -c, --canonicalize     affichage des chemins canoniques\n"
-" -d, --direction <mot>  direction de recherche - « forward » ou "
-"« backward »\n"
-" -e, --evaluate         afficher tous les TAG (LABEL/UUID) évalués\n"
-" -f, --first-only       n'afficher que le premier système de fichiers "
-"trouvé\n"
-" -h, --help             afficher cette aide\n"
-" -i, --invert           inverser le sens de correspondance\n"
-" -l, --list             utiliser le format de sortie en liste\n"
-" -n, --noheadings       ne pas afficher les en-têtes\n"
-" -u, --notruncate       ne pas tronquer le texte en colonnes\n"
-" -O, --options <liste>  limiter le jeu de systèmes de fichiers par options "
-"de montage\n"
-" -o, --output <liste>   colonnes de sortie\n"
-" -r, --raw              utiliser le format de sortie brut\n"
-" -a, --ascii            utiliser des caractères ASCII pour le formatage de "
-"l'arbre\n"
-" -t, --types <liste>    limiter le jeu de systèmes de fichiers par types\n"
-" -v, --nofsroot         ne pas afficher [/dir] pour les montages bind ou "
-"Btrfs\n"
-" -R, --submounts        afficher tous les sous-montages des systèmes de "
-"fichiers correspondants\n"
-" -S, --source <chaîne>  périphérique, LABEL= ou UUID=périphérique\n"
-" -T, --target <chaîne>  point de montage\n"
-"\n"
-
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, c-format
 msgid ""
 "\n"
@@ -8288,7 +8418,7 @@ msgstr ""
 "\n"
 "Colonnes disponibles :\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
@@ -8297,21 +8427,21 @@ msgstr ""
 "\n"
 "Consultez findmnt(1) pour obtenir des renseignements complémentaires.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr "les options s'excluent mutuellement"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr "direction inconnue : « %s »"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "impossible d'analyser la valeur heure_t"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
@@ -8319,20 +8449,20 @@ msgstr ""
 "les options --target et --source ne peuvent être utilisées ensemble avec un "
 "élément de ligne de commande qui n'est pas une option"
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr "impossible d'initialiser le cache libmount"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr "impossible d'initialiser la table de sortie"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr "impossible d'initialiser la colonne de sortie"
 
@@ -8356,12 +8486,12 @@ msgstr "%s : impossible de repérer le processus « %s »\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s : signal inconnu %s ; signaux valables :\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Utilisation : %s [ -s signal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signal ]\n"
@@ -8381,87 +8511,86 @@ msgstr "socket : %s.\n"
 msgid "connect %s"
 msgstr "connect : %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "connexion"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Prochain fichier : %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "impossible d'analyser la priorité"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Valeur hors limites.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger : nom de service inconnu : %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger : nom de priorité inconnu : %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options] [fichier ...]\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8596,8 +8725,8 @@ msgid "failed to open device directory in sysfs"
 msgstr "impossible d'ouvrir le répertoire de périphérique du sysfs"
 
 #: misc-utils/lsblk.c:792
-#, c-format
-msgid "%s: failed to get whole-list devno"
+#, fuzzy, c-format
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s : impossible d'obtenir la liste devno complète"
 
 #: misc-utils/lsblk.c:809
@@ -8615,14 +8744,15 @@ msgstr "%s : impossible de lire le lien"
 msgid "failed to parse list '%s'"
 msgstr "impossible d'analyser la liste « %s »"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 "La liste de périphériques à exclure est trop grande (la limite est de %d "
 "périphériques)"
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, c-format
 msgid ""
 "\n"
@@ -8633,7 +8763,7 @@ msgstr ""
 "Utilisation : \n"
 " %s [options] [<périphérique> ...]\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8674,7 +8804,7 @@ msgstr ""
 " -r, --raw             utiliser le format de sortie brut\n"
 " -t, --topology        afficher les informations à propos de la topologie\n"
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8683,33 +8813,33 @@ msgstr ""
 "\n"
 "Consultez lsblk(8) pour obtenir des renseignements complémentaires.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Utilisation : %s [options]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Ne peut ouvrir %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "A obtenu %d octets de %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "échec de l'exécution de %s"
@@ -8729,26 +8859,15 @@ msgstr "échec de la fonction stat « %s »"
 msgid "%s - No such file or directory\n"
 msgstr "%s - Fichier ou répertoire inexistant\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options] chemin [chemin ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Options :\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8767,8 +8886,7 @@ msgstr ""
 " -n, --nosymlinks    ne pas suivre les liens symétriques\n"
 " -v, --vertical      aligne verticalement les modes et propriétaires\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8776,12 +8894,12 @@ msgstr ""
 "\n"
 "Consultez namei(1) pour obtenir des renseignements complémentaires.\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date argument trop long\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s : limite de liens symboliques dépassée"
@@ -8791,166 +8909,164 @@ msgstr "%s : limite de liens symboliques dépassée"
 msgid "renaming %s to %s failed"
 msgstr "%s : changer le nom de %s vers %s a échoué : %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Utilisation : %s [options] périphérique ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "arguments erronés"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "écriture"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "nb de lectures"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "mauvaise longueur de réponse"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "impossible d'ouvrir ou créer « %s » : %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "impossible de verrouiller %s : %s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "démon uuidd déjà en route avec pid %s\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "Impossible de créer un socket de flux unix : %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Association de socket (bind) impossible %s : %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Impossible de lire le slot unix (socket) %s : %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Erreur lecture du client, longueur=%d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "opération %d, num. entrant = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr "Opération %d\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "Heure UUID générée : %s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "Nbr aléatoire UUID généré : %s\n"
 
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "Heure UUID générée %s et %d suiv.\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "Heure UUID générée %s et %d suiv.\n"
+msgstr[1] "Heure UUID générée %s et %d suiv.\n"
 
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "%d UUID créés :\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "%d UUID créés :\n"
+msgstr[1] "%d UUID créés :\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "Opération %d non valable\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "Longueur de réponse serveur inattendue %d\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "Nombre non valable : %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Erreur d'appel du démon UUIDd (%s) : %s\n"
 
-#: misc-utils/uuidd.c:546
-#, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s et %d UUID suivants\n"
+#: misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s et %d UUID suivants\n"
+msgstr[1] "%s et %d UUID suivants\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "Liste des UUID :\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "Impossible de tuer l'UUIDd de pid %d : %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "UUIDd de pid %d tué\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8958,31 +9074,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options] [fichier ...]\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -9015,29 +9130,31 @@ msgid "%s: write failed"
 msgstr "%s : échec d'écriture"
 
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd octets ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] écrasés à l'index 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Valeur d'index « %s » indiquée non valable"
 
-#: misc-utils/wipefs.c:306
+#: misc-utils/wipefs.c:305
 #, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Utilisation : %s [options] périphérique ...\n"
+
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 " -a, --all           effacer toutes les chaînes magiques (attention !)\n"
 " -h, --help          afficher ce message d'aide\n"
@@ -9045,7 +9162,7 @@ msgstr ""
 " -o, --offset <num>  index à effacer, en octet\n"
 " -p, --parsable      afficher en format analysable plutôt qu'affichable\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -9054,11 +9171,11 @@ msgstr ""
 "\n"
 "Consultez wipefs(8) pour obtenir des renseignements complémentaires.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "--offset et --all sont mutuellement exclusifs"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr "un seul périphérique est actuellement pris en charge en argument."
 
@@ -9155,64 +9272,64 @@ msgstr "erreur de changement de propriétaire de %s : %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossible de renommer %s à %s : %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s : le répertoire /dev n'existe pas."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop : impossible de configurer la capacité du périphérique %s : %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", index %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", taille limite %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cryptage %s (type %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", index %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", type de chiffrement %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 "loop : impossible d'obtenir les renseignements sur le périphérique %s : %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop : impossible d'ouvrir le périphérique %s : %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s : pas le droit d'observer /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s : impossible de trouver un périphérique boucle libre"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -9224,57 +9341,55 @@ msgstr ""
 "utiliser\n"
 "       « modprobe loop »)."
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Mémoire épuisée lors de la lecture de la phrase secrète"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "attention : %s est déjà associé(e) avec %s\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "attention : %s est protégé en écriture, monté en lecture seule.\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Ne peut verrouiller en mémoire, fin d'exécution.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "échec de ioctl LOOP_SET_FD : %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu) : succès\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s) : succès\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop : impossible de détruire le périphérique %s : %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Cette version de mount a été compilée sans prise en charge des périphériques "
 "boucle. Vous devriez recompiler.\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9282,7 +9397,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Utilisation :\n"
@@ -9297,19 +9412,17 @@ msgstr ""
 "<fichier>\n"
 " %1$s [ options ] {-f|--find|loopdev} <fichier>  configurer\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9328,32 +9441,32 @@ msgstr ""
 " -v | --verbose           mode bavard\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "%s : index « %s » indiqué non valable"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "%s : taille limite « %s » indiquée non valable"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Périphérique boucle : %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "périphérique boucle récupéré=%s… nouvel essai\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s : %s : le périphérique est occupé"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9954,14 +10067,17 @@ msgstr "problème dans l'appel de xstrndup"
 msgid "not enough memory"
 msgstr "pas assez de mémoire"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "Le paramètre <special> :\n"
@@ -9971,135 +10087,123 @@ msgstr ""
 " <fichier>                         nom du fichier à utiliser\n"
 "\n"
 
-#: mount/swapon.c:102
-#, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
 msgstr ""
 "\n"
-"Utilisation : (« swap » : espace d'échange)\n"
-" %1$s -a [-e] [-v] [-f]             active tous les swaps de /etc/fstab\n"
-" %1$s [-p priorité] [-d] [-v] [-f] <special>         active le swap donné\n"
-" %1$s -s                            affiche le résumé d'utilisation du swap\n"
-" %1$s -h                            affiche l'aide\n"
-" %1$s -V                            affiche la version\n"
-"\n"
+"Utilisation : %s [options] [fichier ...]\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Utilisation : (« swap » : espace d'échange)\n"
-" %1$s -a [-v]                      désactive tous les swaps\n"
-" %1$s [-v] <special>               désactive le swap donné\n"
-" %1$s -h                           affiche l'aide\n"
-" %1$s -V                           affiche la version\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:128
+msgid ""
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
+msgstr ""
+
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s : format de fichier inattendu"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s : réinitialisation de l'espace d'échange."
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "échec de la fonction « execv »"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "échec de la fonction « waitpid »"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s : échec de la fonction « lseek »"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s : échec d'écriture de signature"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 "%s : signature de l'espace d'échange trouvée : version %d, taille de page "
 "%d, ordre des octets %s"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "différent"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "identique"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s : permissions non sûres %04o, %04o conseillées."
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 "%s : propriétaire %d de fichier non sûr, 0 (superutilisateur) conseillé."
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s : ignoré - semble avoir des trous."
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s : impossible d'obtenir la taille"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s : erreur de lecture de l'en-tête de l'espace d'échange"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 "%s : taille de page : %d, taille d'espace d'échange : %llu, taille de "
 "périphérique : %llu"
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 "%s : dernière_page 0x%08llx plus grande que la taille actuelle de l'espace "
 "d'échange"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s : le format de la taille de page ne correspond pas."
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -10107,38 +10211,38 @@ msgstr ""
 "%s : la taille de page ne correspond pas avec le format d'espace d'échange "
 "(utilisez --fixpgsz pour la réinitialiser)."
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s : données de mise en veille d'application détectées. Réécriture de la "
 "signature de l'espace d'échange."
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s sur %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s : « swapon » a échoué"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "impossible de trouver le périphérique %s"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "Vous n'êtes pas le superutilisateur."
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s : « swapoff » a échoué"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10404,7 +10508,7 @@ msgstr "%s : erreur lors de la suppression de la partition %d"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "%s : erreur lors de la suppression des partitions %d-%d"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, fuzzy, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr "l'intervalle défini <%d:%d> n'a pas de sens"
@@ -10465,22 +10569,17 @@ msgid "%s: %s partition table does not contains usable partitions"
 msgstr ""
 "%s : la table de partitions %s ne contient pas de partitions utilisables"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 "\n"
 "Utilisation :\n"
 " %s [-a|-d|-s] [--nr <N:M> | <périphérique>] <disquecomplet>\n"
 
 #: partx/partx.c:587
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10491,11 +10590,10 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 "\n"
 "Options :\n"
@@ -10515,8 +10613,8 @@ msgstr ""
 " -h, --help           afficher cette aide\n"
 "\n"
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
@@ -10524,7 +10622,7 @@ msgstr ""
 "\n"
 "Colonnes disponibles (pour --show) :\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, c-format
 msgid ""
 "\n"
@@ -10533,26 +10631,26 @@ msgstr ""
 "\n"
 "Consultez partx(8) pour obtenir des renseignements complémentaires.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "les options s'excluent mutuellement"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 msgid "failed to parse --nr <M-N> range"
 msgstr "impossible d'analyser l'intervalle --nr <M-N> "
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "les options --nr et <partition> s'excluent mutuellement"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "%s : impossible d'initialiser la sonde blkid"
@@ -10707,7 +10805,7 @@ msgstr "impossible de configurer la stratégie d'exécution du pid %d"
 msgid "failed to set pid %d's policy"
 msgstr "impossible de configurer la stratégie d'exécution du pid %d"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "impossible d'exécuter %s"
@@ -10995,7 +11093,7 @@ msgstr "%s : %ld seuil par défaut et %ld délai de grâce par défaut\n"
 msgid "Can't set signal handler"
 msgstr "Impossible d'initialiser le traitement de signaux"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "échec de gettimeofday()"
 
@@ -11004,7 +11102,7 @@ msgstr "échec de gettimeofday()"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Impossible d\"émettre CYGETMON sur %s : %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -11012,12 +11110,12 @@ msgstr ""
 "%s : %lu int. %lu/%lu car. ; fifo : %lu seuil, %lu délai, %lu max, %lu "
 "actuel.\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f int/sec ; %f reçu, %f transmis (car/sec)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -11025,7 +11123,7 @@ msgstr ""
 "%s : %lu int., %lu car. ; fifo : %lu thresh, %lu tmout, %lu max, %lu "
 "actuel.\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec ; %f rec (caractères/sec)\n"
@@ -11117,132 +11215,111 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "échec de transformation en démon"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Utilisation : %s [options]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "impossible d'analyser la liste « %s »"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "utilisateur %s inconnu"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "impossible d'analyser la liste « %s »"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "direction inconnue : « %s »"
 
 # disk-utils/mkswap.c:623
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "Échec de la synchronisation du système de fichiers par fsync"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "échec d'écriture : %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "impossible d'analyser la position : %s"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "pas de commande ?\n"
 
 # disk-utils/mkswap.c:623
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "échec de la fonction msgctl"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
 msgstr ""
-"Utilisation : %s [options] <nom de fichier>\n"
 "\n"
-"Options :\n"
+"Utilisation : %s [options] [fichier ...]\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -11254,7 +11331,7 @@ msgstr ""
 " -o, --offset <num>  index de l'allocation, en octet\n"
 " -l, --length <num>  longueur de l'allocation, en octet\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -11263,31 +11340,31 @@ msgstr ""
 "\n"
 "Consultez fallocate(1) pour obtenir des renseignements complémentaires.\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "Pas d'argument de longueur indiqué"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "Valeur de longueur indiquée non valable"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "Valeur d'index indiqué non valable"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "Aucun nom de fichier indiqué."
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr "nombre d'arguments inattendu"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "mode de taille conservée (option -n) non pris en charge"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s : échec de fallocate"
@@ -11295,18 +11372,24 @@ msgstr "%s : échec de fallocate"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "Utilisation : %1$s [-sxun][-w #] fd#\n"
 "              %1$s [-sxon][-w #] fichier [-c] commande ...\n"
@@ -11321,56 +11404,52 @@ msgstr ""
 "  -h  --help       affiche ce texte\n"
 "  -V  --version    affiche la version\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s : %s nécessite exactement un argument\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s : impossible d'ouvrir le fichier verrouillé %s : %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s : nombre non valable : %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 "%s : nécessite un descripteur de fichier, un fichier ou un répertoire\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s : échec de fork : %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Utilisation : %s [options] <point de montage>\n"
 "\n"
 "Options :\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
+#, fuzzy
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 " -h, --help          ce message d'aide\n"
 " -f, --freeze        geler le système de fichiers\n"
 " -u, --unfreeze      dégeler le système de fichiers\n"
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11378,36 +11457,35 @@ msgstr ""
 "\n"
 "Consultez fsfreeze(8) pour obtenir des renseignements complémentaires.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr "Aucune action indiquée"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr "Aucun nom de fichier indiqué"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s : échec de fstat"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr "%s : n'est pas un répertoire"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr "%s : échec de gel"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s : échec de dégel"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11421,8 +11499,7 @@ msgstr ""
 " -m, --minimum <num> taille étendue minimale à abandonner\n"
 " -v, --verbose       afficher le nombre d'octets à abandonner\n"
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11430,98 +11507,87 @@ msgstr ""
 "\n"
 "Consultez fstrim(1) pour obtenir des renseignements complémentaires.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, c-format
 msgid "failed to parse length: %s"
 msgstr "impossible d'analyser la longueur : %s"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, c-format
 msgid "failed to parse offset: %s"
 msgstr "impossible d'analyser la position : %s"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "impossible d'analyser la longueur étendue minimale : %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 msgid "no mountpoint specified."
 msgstr "Aucun point de montage indiqué."
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, c-format
 msgid "%s: not a directory"
 msgstr "%s : pas un répertoire"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s : échec d'ioctl FITRIM"
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
+#, fuzzy, c-format
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr "%s : %<PRIu64> octets ont été taillés\n"
 
-#: sys-utils/ipcmk.c:84
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr ""
-"\n"
-"Utilisation : %s [options]\n"
-"\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <taille>   créer un segment de mémoire partagée de taille <taille>\n"
 "  -S <nsems>    créer un tableau de sémaphores à <nsems> éléments\n"
 "  -Q            créer une file de messages\n"
 "  -p <mode>     permission de ressource (par défaut : 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Consultez ipcmk(1) pour obtenir des renseignements complémentaires.\n"
 "\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "échec de création de mémoire partagée"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "id de mémoire partagée : %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "échec de création de queue de messages"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "id de queue de message : %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "échec de création du sémaphore"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "id de sémaphore : %d\n"
@@ -12042,8 +12108,8 @@ msgstr ""
 "Mémoire partagée segment shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -12052,8 +12118,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "octets=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -12086,8 +12152,8 @@ msgstr ""
 "Queue de messages msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -12119,8 +12185,8 @@ msgstr ""
 "Tableaux de sémaphores semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -12168,17 +12234,15 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "iflag non valable : %s"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Utilisation : %s [ -dhV78neo12 ] [ -s <vitesse> ] [ -i [-]<iflag> ] "
 "<ldisque> <périphérique>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -12186,7 +12250,7 @@ msgstr ""
 "\n"
 "Noms <ldisque> connus :\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
@@ -12194,50 +12258,50 @@ msgstr ""
 "\n"
 "Noms <iflag> connus :\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "vitesse non valable : %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "exécution de ldattach depuis %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "option non valable"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "discipline (configuration) de ligne non valable : %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s n'est pas une ligne série"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossible d'obtenir les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "vitesse %d non supportée"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "impossible de spécifier les attributs du terminal %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "impossible de spécifier la discipline (configuration) de ligne"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "échec de transformation en démon"
 
@@ -12392,15 +12456,14 @@ msgstr "cache %s :"
 msgid "NUMA node%d CPU(s):"
 msgstr "Nœud(s) NUMA%d microprocesseur(s) :"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "Donne des informations sur l'architecture de microprocesseur\n"
 "\n"
@@ -12410,26 +12473,22 @@ msgstr ""
 "  -x, --hex      afficher les masques hexadécimaux plutôt que les listes de "
 "microprocesseurs\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12438,12 +12497,12 @@ msgstr ""
 "\n"
 "Consultez mount(8) pour obtenir des renseignements complémentaires.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s : n'est pas un répertoire"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s est monté.\t "
@@ -12484,46 +12543,44 @@ msgstr ""
 "\t -n                   désactiver l'auto-détection de l'ordre des octets\n"
 "\t -V                   afficher la version et quitter\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile : erreur d'écriture %s : %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Ordre des octets supposé inversé. Utiliser -n pour forcer l'ordre natif.\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step : %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s : %s(%i): ligne de map erronée\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s : impossible de repérer « _stext » dans %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s : adresse de profile hors limites. Mauvais fichier map ?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:55
-#, c-format
+#: sys-utils/renice.c:56
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12535,10 +12592,8 @@ msgstr ""
 " %1$s [-n] <priorité>  -u <utilisateur> [<utilisateur> ...]\n"
 
 #: sys-utils/renice.c:62
-#, c-format
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12557,8 +12612,7 @@ msgstr ""
 " -u, --user <nom|id>    interpréter comme nom ou identifiant utilisateur\n"
 " -v, --version          afficher la version\n"
 
-#: sys-utils/renice.c:70
-#, c-format
+#: sys-utils/renice.c:69
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12566,71 +12620,60 @@ msgstr ""
 "\n"
 "Consultez renice(1) pour obtenir des renseignements complémentaires.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "modification de priorité depuis %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, c-format
 msgid "unknown user %s"
 msgstr "utilisateur %s inconnu"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, c-format
 msgid "bad value %s"
 msgstr "valeur %s erronée"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr "identifiant de processus"
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 msgid "user ID"
 msgstr "identifiant d'utilisateur"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr "identifiant de groupe de processus"
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "impossible d'obtenir la priorité pour %d (%s)"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "impossible de configurer la priorité pour %d (%s)"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d (%s) priorité précédente %d, nouvelle priorité %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Utilisation : %s [options]\n"
-"\n"
-"Options :\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "    -d | --device <périph.>   choisir le périphérique d'horloge RTC (rtc0|"
 "rtc1|...)\n"
@@ -12644,8 +12687,7 @@ msgstr ""
 "    -v | --verbose            mode bavard\n"
 "    -V | --version            afficher la version\n"
 
-#: sys-utils/rtcwake.c:100
-#, c-format
+#: sys-utils/rtcwake.c:101
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12653,150 +12695,150 @@ msgstr ""
 "\n"
 "Consultez rtcwake(8) pour obtenir des renseignements complémentaires.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 msgid "read rtc time failed"
 msgstr "échec de lecture de l'heure RTC"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 msgid "read system time failed"
 msgstr "échec de lecture de l'heure système"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 msgid "convert rtc time failed"
 msgstr "échec de conversion de l'heure courante RTC"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 msgid "set rtc alarm failed"
 msgstr "échec de configuration d'alarme de l'horloge RTC"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr "échec d'activation de l'alarme RTC"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr "échec de configuration d'alarme de réveil RTC"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 msgid "read rtc alarm failed"
 msgstr "échec de lecture de l'alarme RTC"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr "alarme : arrêt\n"
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 msgid "convert time failed"
 msgstr "échec de conversion de l'heure"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr "alarme : fonctionnement  %s"
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "état de veille non reconnu « %s »"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 msgid "failed to parse seconds value"
 msgstr "impossible d'analyser la valeur secondes"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 msgid "failed to parse time_t value"
 msgstr "impossible d'analyser la valeur heure_t"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s : on considère que l'horloge RTC utilise l'échelle UTC…\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Heure UTC utilisée.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Heure locale utilisée.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr "vous devez fournir l'heure de réveil (consultez les options -t et -s)"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s non activé pour les événements « wakeup » (réveil)"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarme %ld, heure_système %ld, heure_horloge %ld, secondes %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr "l'heure ne peut pas reculer vers %s"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s : « wakeup » (réveil) avec %s à %s"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s : « wakeup » (réveil) depuis « %s » avec %s à %s"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr "mode de veille : aucun ; sortie\n"
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr "mode de veille : éteint ; exécution de %s\n"
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, c-format
 msgid "unable to execute %s"
 msgstr "impossible d'exécuter %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr "mode de veille : en fonctionnement ; lecture d'horloge RTC\n"
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 msgid "rtc read failed"
 msgstr "échec de lecture d'horloge RTC"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr "mode de veille : désactivé ; désactivation de l'alarme\n"
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr "mode de veille : montré ; affichage d'information d'alarme\n"
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr "mode de veille : %s ; mise en veille du système\n"
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr "échec de désactivation de l'interruption gérant l'alarme RTC"
 
@@ -12870,16 +12912,16 @@ msgstr ""
 "%s : %s\n"
 "Exécutez « %s --help » pour plus de renseignements.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s : architecture inconnue"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Pas assez d'arguments"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Impossible de configurer l'architecture système à %s"
@@ -12963,20 +13005,19 @@ msgstr "%s utilise IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s utilisant la scrutation\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "Utilisation : %s [options] <programme> [arg ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "Exécution du programme avec quelques noms d'espaces non partagés par leur "
 "parent\n"
@@ -12987,8 +13028,7 @@ msgstr ""
 "  -i, --ipc         unshare nom d'espace IPC System V\n"
 "  -n, --net         unshare nom d'espace réseau\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12996,147 +13036,147 @@ msgstr ""
 "\n"
 "Consultez unshare(1) pour obtenir des renseignements complémentaires.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "échec de unshare"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "impossible de configurer l'identifiant de groupe"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "impossible de configurer l'identifiant d'utilisateur"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s : impossible d'exécuter %s : %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s : impossible d'exécuter %s : %m"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s : impossible de repérer le processus « %s »\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s : impossible d'exécuter %s : %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "impossible d'allouer le tampon de sortie"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "valeur erronée d'expiration de la minuterie : %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Pas assez d'arguments"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "impossible d'allouer le tampon de sortie"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "vitesse erronée : %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "trop de vitesses alternatives"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s : ne peut ouvrir en tant qu'entrée standard : %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s : n'est pas périphérique caractère"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s : n'est pas ouvert en lecture/écriture"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s : problème avec dup : %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "type : %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s : lu : %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s : dépassement du tampon d'entrée"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -13148,69 +13188,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "utilisateur"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "utilisateurs"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 msgid "ttyname failed"
 msgstr "échec de ttyname"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, c-format
 msgid "stat %s failed"
 msgstr "échec de « stat » %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 msgid "is y"
 msgstr "est y"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 msgid "is n"
 msgstr "est n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, c-format
 msgid "change %s mode failed"
 msgstr "échec de modification du mode %s"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "iflag non valable : %s"
@@ -13226,54 +13260,48 @@ msgstr ""
 "Utiliser « %s [options] %s » si vous désirez réellement l'utiliser.\n"
 "Le script n'a pas été démarré.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options] [fichier ...]\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "impossible d'ouvrir le fichier de déroulement temporel %s"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Le script a débuté, le fichier est %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Le script a débuté sur %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s : impossible d'écrire le fichier script, erreur : %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -13282,79 +13310,76 @@ msgstr ""
 "\n"
 "Script terminé sur %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script terminé, le fichier est %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "échec de openpty\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Manque de pty\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <fichier_déroulement_temporel> [<script_enregistré> [<diviseur>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "nombre attendu, mais « %s » obtenu"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "diviseur « %s »"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "échec d'écriture sur la sortie standard"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "fin de fichier inattendue sur %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "impossible de lire le fichier script enregistré %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "nombre d'arguments inattendu"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "impossible d'ouvrir le fichier de script enregistré %s"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "impossible de lire le fichier de déroulement temporel %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "fichier de déroulement temporel %s : %lu : format inattendu"
@@ -13365,50 +13390,47 @@ msgid "Argument error."
 msgstr "%s : erreur d'argument, utilisation\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13417,62 +13439,62 @@ msgstr ""
 "\n"
 "Consultez lsblk(8) pour obtenir des renseignements complémentaires.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "impossible d'activer le nettoyage automatique de l'écran\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "impossible de désactiver le nettoyage automatique de l'écran\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr ""
 "impossible de savoir si le nettoyage automatique de l'écran est actif\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "ne peut exécuter le mode (un)set powersave\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "ne peut ouvrir le périphérique %s pour écriture\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "erreur klogctl : %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Erreur lors de l'écriture du screendump\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Impossible de lire %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s : $TERM n'est pas défini.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s : signal %s inconnu\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13500,144 +13522,149 @@ msgstr "fork : %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options] [fichier ...]\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "option non valable"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "valeur erronée d'expiration de la minuterie : %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "impossible d'ouvrir un fichier temporaire"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "impossible de configurer l'identifiant d'utilisateur"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Impossible d'obtenir la taille du disque"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Diffusion de message de %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr "ne lira pas %s - utiliser stdin."
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 msgid "fstat failed"
 msgstr "échec de fstat"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 msgid "fread failed"
 msgstr "échec de fread"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Utilisation : %s [options] chemin [chemin ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write : impossible de repérer le nom de votre tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write : vos permissions d'écriture sont désactivées.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write : %s n'est pas connecté sur %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write : %s a désactivé la réception de messages sur %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write : %s n'est pas connecté\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write : %s a désactivé la réception de messages\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write : %s est connecté plus d'une fois ; on écrit à %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Ligne d'entrée trop longue."
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Message de %s@%s (comme %s) sur %s à %s…"
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Message de %s@%s sur %s à %s…"
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "échec de calloc"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Utilisation : %s [options]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13834,7 +13861,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -14045,7 +14072,7 @@ msgstr ""
 "\n"
 "Motif non trouvé\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Motif non trouvé"
 
@@ -14114,7 +14141,7 @@ msgstr "hexdump : format erroné {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump : conversion erronée de caractères %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -14166,7 +14193,7 @@ msgstr ""
 "Voir pg(1) pour plus d'informations.\n"
 "-------------------------------------------------------\n"
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -14174,81 +14201,81 @@ msgstr ""
 "%s : Utilisation : %s [-numéro] [-p chaîne] [-cefnrs] [+ligne] [+/motif/] "
 "[fichiers]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s : l'option nécessite un argument -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s : option incorrecte -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "… escamotage avant\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "… escamotage arrière\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Pas de prochain fichier"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Pas de fichier précédent"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s : erreur de lecture à partir du fichier %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s : EOF inattendue dans le fichier %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s : erreur inconnue dans le fichier %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s : ne peut créer le fichier temporaire\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "erreur RE : "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Pas de chaîne de recherche mémorisée"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Ne peut ouvrir"
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "sauvegarder"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr " : !commande non autorisée en mode rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "échec du fork(), essayer à nouveau plus tard.\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Prochain fichier : "
 
@@ -14324,8 +14351,8 @@ msgstr ""
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -14341,38 +14368,328 @@ msgstr "impossible d'analyser la valeur heure_t"
 msgid "no input file specified"
 msgstr "Aucun nom de fichier indiqué"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr ""
+"\n"
+"Utilisation : %s [options] [fichier ...]\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "problème à la lecture de terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "séquence d'échappement inconnue en entrée : %o, %o"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 msgid "Input line too long."
 msgstr "Ligne d'entrée trop longue."
 
-#~ msgid "Usage:\n"
-#~ msgstr "Utilisation :\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Erreur de fermeture du fichier\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr ""
+#~ "Désolé, vous devriez modifier l'étiquette des partitions non vides.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Avertissement : partition %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Avertissement : partitions %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "et %s se chevauchent\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Utilisation : \n"
+#~ " %s [options] [<périphérique> ...]\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "périphérique : quelque chose comme /dev/hda ou /dev/sda"
+
+#~ msgid "success"
+#~ msgstr "succès"
+
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -a, --all               mount all filesystems mentioned in fstab\n"
+#~ " -f, --fake              dry run, skip mount(2) syscall\n"
+#~ " -F, --fork              fork off for each device (use with -a)\n"
+#~ " -h, --help              this help\n"
+#~ " -n, --no-mtab           don't write to /etc/mtab\n"
+#~ " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
+#~ " -v, --verbose           verbose mode\n"
+#~ " -V, --version           print version string\n"
+#~ " -w, --read-write        mount the filesystem read-write (default)\n"
+#~ " -o, --options <list>    comma separated string of mount options\n"
+#~ " -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
+#~ " -t, --types <list>      indicate the filesystem type\n"
+#~ " -c, --no-canonicalize   don't canonicalize paths\n"
+#~ " -i, --internal-only     don't call the mount.<type> helpers\n"
+#~ " -l, --show-labels       lists all mounts with LABELs\n"
+#~ "\n"
+#~ "Source:\n"
+#~ " -L, --label <label>     synonym for LABEL=<label>\n"
+#~ " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
+#~ " LABEL=<label>           specifies device by filesystem label\n"
+#~ " UUID=<uuid>             specifies device by filesystem UUID\n"
+#~ " <device>                specifies device by path\n"
+#~ " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
+#~ " <file>                  regular file for loopdev setup\n"
+#~ "\n"
+#~ "Operations:\n"
+#~ " -B, --bind              mount a subtree somewhere else (same as -o "
+#~ "bind)\n"
+#~ " -M, --move              move a subtree to some other place\n"
+#~ " -R, --rbind             mount a subtree and all submounts somewhere "
+#~ "else\n"
+#~ " --make-shared           mark a subtree as shared\n"
+#~ " --make-slave            mark a subtree as slave\n"
+#~ " --make-private          mark a subtree as private\n"
+#~ " --make-unbindable       mark a subtree as unbindable\n"
+#~ " --make-rshared          recursively mark a whole subtree as shared\n"
+#~ " --make-rslave           recursively mark a whole subtree as slave\n"
+#~ " --make-rprivate         recursively mark a whole subtree as private\n"
+#~ " --make-runbindable      recursively mark a whole subtree as unbindable\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Options :\n"
+#~ " -a, --all               monter tous les systèmes de fichiers indiqués "
+#~ "dans fstab\n"
+#~ " -f, --fake              répétition, sauter l'appel système mount(2)\n"
+#~ " -F, --fork              bifurquer pour chaque périphérique (utiliser "
+#~ "avec -a)\n"
+#~ " -h, --help              cette aide\n"
+#~ " -n, --no-mtab           ne pas écrire dans /etc/mtab\n"
+#~ " -r, --read-only         monter le  système de fichiers en lecture seule "
+#~ "(comme -o ro)\n"
+#~ " -v, --verbose           mode bavard\n"
+#~ " -V, --version           afficher la version\n"
+#~ " -w, --read-write        monter le système de fichiers en lecture/"
+#~ "écriture (par défaut)\n"
+#~ " -o, --options <liste>   chaîne séparée par des virgules d'options de "
+#~ "montage\n"
+#~ " -O, --test-opts <liste> limiter le jeu de systèmes de fichiers (utiliser "
+#~ "avec -a)\n"
+#~ " -t, --types <liste>     indiquer le type de système de fichiers\n"
+#~ " -c, --no-canonicalize   ne pas canoniser les chemins\n"
+#~ " -i, --internal-only     ne pas appeler les assistants mount.<type>\n"
+#~ " -l, --show-labels       afficher la liste de tous les montages avec les "
+#~ "étiquettes\n"
+#~ "\n"
+#~ "Source :\n"
+#~ " -L, --label <étiquette> synonyme de LABEL=<étiquette>\n"
+#~ " -U, --uuid <uuid>       synonyme de UUID=<uuid>\n"
+#~ " LABEL=<étiquette>       indiquer le périphérique par étiquette de "
+#~ "système de fichiers\n"
+#~ " UUID=<uuid>             indiquer le périphérique par UUID de système de "
+#~ "fichiers\n"
+#~ " <périphérique>          indiquer le périphérique par chemin\n"
+#~ " <répertoire>            point de montage pour remontages (consultez --"
+#~ "bind/rbind)\n"
+#~ " <fichier>               fichier régulier pour configuration de "
+#~ "périphérique boucle\n"
+#~ "\n"
+#~ "Opérations :\n"
+#~ " -B, --bind              monter un sous-répertoire ailleurs (comme -o "
+#~ "bind)\n"
+#~ " -M, --move              déplacer un sous-répertoire ailleurs\n"
+#~ " -R, --rbind             monter un sous-répertoire et tous les sous-"
+#~ "montages ailleurs\n"
+#~ " --make-shared           marquer un sous-répertoire comme partagé\n"
+#~ " --make-slave            marquer un sous-répertoire comme esclave\n"
+#~ " --make-private          marquer un sous-répertoire comme privé\n"
+#~ " --make-unbindable       marquer un sous-répertoire comme non remontable\n"
+#~ " --make-rshared          marquer récursivement un sous-répertoire complet "
+#~ "comme partagé\n"
+#~ " --make-rslave           marquer récursivement un sous-répertoire complet "
+#~ "comme esclave\n"
+#~ " --make-rprivate         marquer récursivement un sous-répertoire complet "
+#~ "comme privé\n"
+#~ " --make-runbindable      marquer récursivement un sous-répertoire complet "
+#~ "comme non remontable\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -s, --fstab            search in static table of filesystems\n"
+#~ " -m, --mtab             search in table of mounted filesystems\n"
+#~ " -k, --kernel           search in kernel table of mounted \n"
+#~ "                        filesystems (default)\n"
+#~ "\n"
+#~ " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
+#~ " -w, --timeout <num>    upper limit in millisecods which --poll will "
+#~ "block\n"
+#~ "\n"
+#~ " -c, --canonicalize     canonicalize printed paths\n"
+#~ " -d, --direction <word> search direction - 'forward' or 'backward'\n"
+#~ " -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+#~ " -f, --first-only       print the first found filesystem only\n"
+#~ " -h, --help             print this help\n"
+#~ " -i, --invert           invert sense of matching\n"
+#~ " -l, --list             use list format output\n"
+#~ " -n, --noheadings       don't print headings\n"
+#~ " -u, --notruncate       don't truncate text in columns\n"
+#~ " -O, --options <list>   limit the set of filesystems by mount options\n"
+#~ " -o, --output <list>    output columns\n"
+#~ " -P, --pairs            use key=\"value\" output format\n"
+#~ " -r, --raw              use raw output format\n"
+#~ " -a, --ascii            use ascii chars for tree formatting\n"
+#~ " -t, --types <list>     limit the set of filesystem by FS types\n"
+#~ " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
+#~ " -R, --submounts        print all submount for the matching filesystems\n"
+#~ " -S, --source <string>  device, LABEL= or UUID=device\n"
+#~ " -T, --target <string>  mountpoint\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Options :\n"
+#~ " -s, --fstab            rechercher dans la table statique des systèmes de "
+#~ "fichiers\n"
+#~ " -m, --mtab             rechercher dans la table des systèmes de fichiers "
+#~ "montés\n"
+#~ " -k, --kernel           rechercher dans la table du noyau des systèmes de "
+#~ "fichiers\n"
+#~ "                        montés (par défaut)\n"
+#~ "\n"
+#~ " -c, --canonicalize     affichage des chemins canoniques\n"
+#~ " -d, --direction <mot>  direction de recherche - « forward » ou "
+#~ "« backward »\n"
+#~ " -e, --evaluate         afficher tous les TAG (LABEL/UUID) évalués\n"
+#~ " -f, --first-only       n'afficher que le premier système de fichiers "
+#~ "trouvé\n"
+#~ " -h, --help             afficher cette aide\n"
+#~ " -i, --invert           inverser le sens de correspondance\n"
+#~ " -l, --list             utiliser le format de sortie en liste\n"
+#~ " -n, --noheadings       ne pas afficher les en-têtes\n"
+#~ " -u, --notruncate       ne pas tronquer le texte en colonnes\n"
+#~ " -O, --options <liste>  limiter le jeu de systèmes de fichiers par "
+#~ "options de montage\n"
+#~ " -o, --output <liste>   colonnes de sortie\n"
+#~ " -r, --raw              utiliser le format de sortie brut\n"
+#~ " -a, --ascii            utiliser des caractères ASCII pour le formatage "
+#~ "de l'arbre\n"
+#~ " -t, --types <liste>    limiter le jeu de systèmes de fichiers par types\n"
+#~ " -v, --nofsroot         ne pas afficher [/dir] pour les montages bind ou "
+#~ "Btrfs\n"
+#~ " -R, --submounts        afficher tous les sous-montages des systèmes de "
+#~ "fichiers correspondants\n"
+#~ " -S, --source <chaîne>  périphérique, LABEL= ou UUID=périphérique\n"
+#~ " -T, --target <chaîne>  point de montage\n"
+#~ "\n"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd octets ["
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Utilisation : (« swap » : espace d'échange)\n"
+#~ " %1$s -a [-e] [-v] [-f]             active tous les swaps de /etc/fstab\n"
+#~ " %1$s [-p priorité] [-d] [-v] [-f] <special>         active le swap "
+#~ "donné\n"
+#~ " %1$s -s                            affiche le résumé d'utilisation du "
+#~ "swap\n"
+#~ " %1$s -h                            affiche l'aide\n"
+#~ " %1$s -V                            affiche la version\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Utilisation : (« swap » : espace d'échange)\n"
+#~ " %1$s -a [-v]                      désactive tous les swaps\n"
+#~ " %1$s [-v] <special>               désactive le swap donné\n"
+#~ " %1$s -h                           affiche l'aide\n"
+#~ " %1$s -V                           affiche la version\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Utilisation : %s [options] <nom de fichier>\n"
+#~ "\n"
+#~ "Options :\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Utilisation : %s [options]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Utilisation : %s [options]\n"
+#~ "\n"
+#~ "Options :\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Utilisation : %s [options] [fichier ...]\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14518,31 +14835,12 @@ msgstr "Ligne d'entrée trop longue."
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [ou --help] :       afficher l'aide mémoire"
 
-#~ msgid "dangerous options:"
-#~ msgstr "options dangereuses :"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [ou --show-geometry] :    afficher les données de géométrie\n"
 #~ "                                 du point de vue du noyau"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [ou --show-pt-geometry] : afficher la géométrie estimée\n"
-#~ "                                 à partir de la table de partitions"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [ou --show-extended] :    afficher aussi les partitions étendues "
-#~ "en sortie\n"
-#~ "                                 ou les descripteurs attendus en entrée "
-#~ "pour elles"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14605,62 +14903,9 @@ msgstr "Ligne d'entrée trop longue."
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [options] [--] paramètres de la chaîne d'option\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [options] -o|--options chaine d'options [options] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              paramètres\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            permettre les options de forme longue avec "
-#~ "un simple -\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   afficher l'aide mémoire\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr ""
-#~ "  -l, --longoptions=opt-long   reconnaîtres les options de forme longue\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=nom-de-programme le nom sous lequel les erreurs sont "
-#~ "rapportées\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr ""
-#~ "  -o, --options=chaîne-opt    reconnaître les options de forme courte\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  désactiver les rapports d'erreur par getopt"
-#~ "(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           pas d'affichage normal\n"
-
-# getopt-1.1.2/getopt.c:335
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=shell            initialiser la convention de commentaire "
-#~ "du shell\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   afficher la version de getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr ""
-#~ "  -u, --unqote                 ne pas commenter avec des guillemets la "
-#~ "sortie\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                afficher la version\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (amélioré) 1.1.4\n"
 
diff --git a/po/gl.po b/po/gl.po
index 57961a90b..4fbce7366 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.18-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-08-23 18:09+0200\n"
 "Last-Translator: Fran Diéguez <frandieguez@ubuntu.com>\n"
 "Language-Team: Galician <proxecto@trasno.net>\n"
@@ -108,29 +108,29 @@ msgstr "volve a ler a táboa de particións"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "obtén o tamaño en sectores de 512 bytes"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "non se pode abrir %s"
@@ -213,7 +213,7 @@ msgid "Verifying ... "
 msgstr "Verificando... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "non se pode abrir %s"
@@ -253,15 +253,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -274,7 +274,7 @@ msgstr ""
 msgid "cannot stat file %s"
 msgstr "Non se pode efectuar «stat» sobre o dispositivo %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -323,8 +323,8 @@ msgid "stat failed: %s"
 msgstr "stat fallou: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "open fallou: %s"
@@ -547,55 +547,55 @@ msgstr "desprazamento dos datos do ficheiro non válido"
 msgid "compiled without -x support"
 msgstr "compilado sen a compatibilidade para -x"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s ['larvsmf] /dev/nome\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s está montado.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Desexa continuar?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "comprobación abortada.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zona nr < PRIMEIRAZONA no ficheiro «%s»."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zona nr >= ZONAS no ficheiro «%s»."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Eliminar bloque"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Erro de lectura: non é posíbel buscar nun bloque o ficheiro «%s»\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Erro de lectura: bloque incorrecto no ficheiro «%s»\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -604,296 +604,296 @@ msgstr ""
 "Erro interno: tentando escribir un bloque incorrecto\n"
 "Ignorouse a solicitude de escritura\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "Non é posíbel escribir o superbloque"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Non é posíbel escribir a táboa de nodos-i"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Non é posíbel escribir a táboa de zonas"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Non é posíbel escribir nodos-i"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "produciuse un fallo na busca"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "non é posíbel reserver o búfer para o superbloque"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "non é posíbel ler o superbloque"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "número máxico incorrecto no superbloque"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Só se admiten bloques/zonas de 1k"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Non é posíbel reservar o búfer para o mapa de nodos-i"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Non é posíbel reservar o búfer para o mapa de zonas"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Non é posíbel reservar o búfer para os nodos-i"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Non é posíbel reservar o búfer para a conta de nodos-i"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Non é posíbel reservar o búfer para a conta de zonas"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Non é posíbel reservar o mapa de nodos-i"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Non é posíbel ler a táboa de zonas"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Non é posíbel ler os nodos-i"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld nodos-i\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld bloques\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primeira zona de datos=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tamaño da zona=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Tamaño máximo=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estado do sistema de ficheriso=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "Lonxitude do nome=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "O nodo-i %d marcouse como non utilizado, pero estase usando para o ficheiro "
 "«%s»\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Marcar en uso"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "O ficheiro «%s» ten o modo %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Aviso: a conta de nodos-i é demasiado grande.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "o nodo-i raíz non é un cartafol"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "O bloque foi usado anteriormente. Agora no ficheiro «%s»."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Borrar"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "O bloque %d no ficheiro «%s» está marcado como en uso."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Correcto"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Eliminar"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "Erro interno"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
 #, c-format
-msgid "Inode %d mode not cleared."
+msgid "Inode %lu mode not cleared."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
 #, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
 #, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Estabelecer"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
 #, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Estabelecer i_nlinks para contar"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zona %d: marcada en uso, ningún ficheiro a usa."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Eliminar marca"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zona %d: en uso, contados=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zona %d: non en uso, contados=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "tamaño de nodo-i incorrecto"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "tamaño de nodo-i v2 incorrecto"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "Necesítase a terminal para reparacións interactivas"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "Non é posíbel abrir «%s»: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s está limpo, non se comproba.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forzando a comprobación do sistema de ficheiros en %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "O sistema de ficheiros en %s está sucio, precisa unha comprobación.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -902,12 +902,12 @@ msgstr ""
 "\n"
 "%6ld nodos-i usados (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zonas usadas (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -930,7 +930,7 @@ msgstr ""
 "------\n"
 "%6d ficheiros\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1053,7 +1053,7 @@ msgstr "demasiados nodos-i - o máximo é 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "non hai espazo suficiente, necesítanse cando menos %llu bloques"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -1202,9 +1202,9 @@ msgid "%6.2f%% (%+ld bytes)\t%s\n"
 msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:668
-#, c-format
-msgid "closing file %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "cannot close file %s"
+msgstr "non se pode abrir %s"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1309,185 +1309,195 @@ msgid ""
 "that some device files will be wrong."
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Uso: %s [-c] [-pPAGESZ] [-L etiqueta] [-U UUID] /dev/nome [bloques]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, c-format
 msgid "%s: unable to clear boot sector"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "volve a ler a táboa de particións"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "Non é posíbel escribir o superbloque"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "Non é posíbel escribir a táboa de nodos-i"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "Non é posíbel escribir a táboa de zonas"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "Non é posíbel escribir nodos-i"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "%s fallou."
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, c-format
 msgid "%s: write failed in write_block"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "demasiadas páxinas incorrectas"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, c-format
 msgid "%s: not enough good blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "non é posíbel reserver o búfer para o superbloque"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "Non é posíbel reservar o búfer para o mapa de zonas"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "Non é posíbel reservar o búfer para os nodos-i"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld nodos-i\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld bloques\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "%s: non é un dispositivo de bloques\n"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "tamaño de nodo-i incorrecto"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, c-format
 msgid "%s: device is misaligned"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "o número de bloques é demasiado pequeno"
@@ -1814,7 +1824,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr ""
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2138,7 +2148,7 @@ msgid "   Logical"
 msgstr ""
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr ""
 
@@ -2786,12 +2796,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2937,7 +2947,7 @@ msgid "tracks/cylinder"
 msgstr "pistas/cilindro"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cilindros"
 
@@ -3004,12 +3014,12 @@ msgstr ""
 msgid "This partition already exists.\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3212,7 +3222,7 @@ msgstr ""
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr ""
 
@@ -3604,7 +3614,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr ""
 
@@ -3683,7 +3693,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3818,37 +3828,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3857,64 +3867,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4181,7 +4191,7 @@ msgstr ""
 
 #: fdisk/fdisksgilabel.c:536
 #, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
 msgstr ""
 
 #: fdisk/fdisksgilabel.c:542
@@ -4193,7 +4203,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr ""
 
@@ -4372,26 +4382,26 @@ msgstr ""
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4399,14 +4409,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4415,7 +4425,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4428,7 +4438,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4437,28 +4447,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -4913,7 +4923,7 @@ msgstr ""
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4921,161 +4931,161 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
 "before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5083,362 +5093,425 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1246
+#: fdisk/sfdisk.c:1236
 #, c-format
-msgid "Warning: partition %s "
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1247
+#: fdisk/sfdisk.c:1248
 #, c-format
-msgid "is not contained in partition %s\n"
+msgid "Warning: partitions %s and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr ""
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr ""
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Uso: %s [opción]\n"
+msgstr "Uso:\n"
 
-#: fdisk/sfdisk.c:2355
-#, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr ""
+#: fdisk/sfdisk.c:2332
+#, fuzzy, c-format
+msgid " %s [options] <device> [...]\n"
+msgstr "Uso: %s [opción]\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "Uso: %s [opción]\n"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2364
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5447,103 +5520,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5551,73 +5624,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5647,100 +5720,102 @@ msgstr ""
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s tivo éxito.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s fallou.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, c-format
 msgid "WARNING: couldn't open %s"
 msgstr ""
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "Non se encontrou o patrón"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr ""
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr ""
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5748,58 +5823,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "demasiadas páxinas incorrectas"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "non se pode abrir %s"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s está montado.\t "
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr ""
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr ""
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "demasiadas páxinas incorrectas"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -5816,33 +5891,66 @@ msgstr ""
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt/getopt.c:314
+#: getopt/getopt.c:317
 #, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+
+#: getopt/getopt.c:323
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+
+#: getopt/getopt.c:324
+msgid " -h, --help                   This small usage guide\n"
+msgstr ""
+
+#: getopt/getopt.c:325
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:326
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+
+#: getopt/getopt.c:327
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "                s - Táboa ordenada por sectores"
+
+#: getopt/getopt.c:329
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr ""
+
+#: getopt/getopt.c:330
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+
+#: getopt/getopt.c:331
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr ""
+
+#: getopt/getopt.c:332
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr ""
+
+#: getopt/getopt.c:333
+msgid " -V, --version                Output version information\n"
 msgstr ""
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr ""
 
@@ -6247,137 +6355,151 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 msgid "Unable to connect to audit system"
 msgstr ""
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time."
 msgstr ""
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr ""
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
 msgstr ""
@@ -6549,7 +6671,7 @@ msgid "failed to read mtab"
 msgstr "aviso: formato de cramfs antigo\n"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr ""
 
@@ -6590,71 +6712,111 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr ""
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr ""
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "%s fallou."
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "produciuse un fallo ao reservar o búfer de saída"
@@ -6737,7 +6899,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr ""
 
@@ -7158,47 +7320,48 @@ msgstr ""
 msgid "too many bare linefeeds."
 msgstr "demasiadas páxinas incorrectas"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr ""
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "write falou: (%s)"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -7225,7 +7388,7 @@ msgstr ""
 msgid "setuid failed"
 msgstr "produciuse un fallo na busca"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr ""
@@ -7270,8 +7433,8 @@ msgstr ""
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr ""
 
@@ -7323,24 +7486,21 @@ msgstr ""
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7447,32 +7607,32 @@ msgstr " Eliminar"
 msgid "failed to add line to output"
 msgstr ""
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "erro de análise na liña: "
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "volve a ler a táboa de particións"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "hexdump: non é posíbel ler %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "produciuse un fallo ao reservar o búfer de saída"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc fallou"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7483,89 +7643,114 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Ordes dispoñíbeis:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr ""
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr ""
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr ""
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr ""
 
@@ -7589,12 +7774,12 @@ msgstr ""
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr ""
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr ""
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr ""
@@ -7614,82 +7799,81 @@ msgstr "Socket(s) da CPU:"
 msgid "connect %s"
 msgstr ""
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr ""
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr ""
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Seguinte ficheiro: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "%s fallou."
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, c-format
 msgid "port `%ld' out of range"
 msgstr ""
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "Orde descoñecida: %s"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "Orde descoñecida: %s"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -7827,7 +8011,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s fallou."
 
 #: misc-utils/lsblk.c:809
@@ -7845,12 +8029,13 @@ msgstr "%s fallou."
 msgid "failed to parse list '%s'"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7858,7 +8043,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -7881,40 +8066,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "non se pode abrir %s"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "a execución de %s fallou."
@@ -7934,22 +8119,12 @@ msgstr ""
 msgid "%s - No such file or directory\n"
 msgstr ""
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
-msgstr ""
-
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
+msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -7961,18 +8136,17 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 msgid "pathname argument is missing"
 msgstr ""
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -7982,166 +8156,164 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: fstat fallou."
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr ""
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr ""
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr ""
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8149,29 +8321,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Uso: %s [opción]\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8205,42 +8376,43 @@ msgstr ""
 
 #: misc-utils/wipefs.c:240
 #, c-format
-msgid "%zd bytes ["
-msgstr ""
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr ""
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Uso: %s [opción]\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8330,118 +8502,116 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%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/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8449,51 +8619,48 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9006,159 +9173,162 @@ msgstr ""
 msgid "not enough memory"
 msgstr ""
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Uso: %s [opción]\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr ""
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr ""
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr ""
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr ""
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr ""
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr ""
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr ""
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9424,7 +9594,7 @@ msgstr ""
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -9484,19 +9654,13 @@ msgstr "Esta partición non é usábel"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr ""
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -9507,46 +9671,45 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Ordes dispoñíbeis:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr ""
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 msgid "failed to parse --nr <M-N> range"
 msgstr ""
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr ""
@@ -9671,7 +9834,7 @@ msgstr "%s fallou."
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9928,7 +10091,7 @@ msgstr ""
 msgid "Can't set signal handler"
 msgstr ""
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr ""
 
@@ -9937,24 +10100,24 @@ msgstr ""
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr ""
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr ""
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
@@ -10042,123 +10205,106 @@ msgstr ""
 msgid "ftp daemon"
 msgstr ""
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Uso: %s [opción]\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "Orde descoñecida: %s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Orde descoñecida: %s"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "symlink fallou: %s"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "write falou: (%s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 msgid "unsupported command"
 msgstr ""
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "malloc fallou"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "Uso: %s [opción]\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10166,38 +10312,38 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr ""
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr ""
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr ""
@@ -10205,98 +10351,97 @@ msgstr ""
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr ""
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr ""
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr ""
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
-msgstr ""
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
+msgstr "%s está montado.\t "
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat fallou."
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr ""
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10305,95 +10450,84 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "%s: produciuse un erro ao abrir: %s\n"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 msgid "no mountpoint specified."
 msgstr ""
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "o nodo-i raíz non é un cartafol"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: fstat fallou."
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:84
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -10881,7 +11015,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:621
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:623
@@ -10891,7 +11025,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:625
 #, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:628
@@ -10922,7 +11056,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:647
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:649
@@ -10953,7 +11087,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:680
 #, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:682
@@ -11001,69 +11135,67 @@ msgstr ""
 msgid "invalid iflag: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr ""
 
@@ -11214,48 +11346,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, c-format
 msgid "%s is not a mountpoint\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s está montado.\t "
@@ -11278,55 +11405,50 @@ msgid ""
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11335,238 +11457,227 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, c-format
+#: sys-utils/renice.c:69
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr ""
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice desde %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "Orde descoñecida: %s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, c-format
 msgid "bad value %s"
 msgstr ""
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 msgid "user ID"
 msgstr ""
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr ""
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr ""
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Uso: %s [opción]\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, c-format
+#: sys-utils/rtcwake.c:101
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "ler a hora rtc"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "ler a hora do sistema"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "converter a hora rtc"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "estabelecer a alarma rtc"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "activar a alarma rtc"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "estabelecer a alarma de espertar de rtc"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "activar a alarma rtc"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "converter a hora rtc"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr ""
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "Valor de sectores ilegal"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 msgid "failed to parse time_t value"
 msgstr ""
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: asumindo que RTC usa UTC ...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Usando a hora UTC.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Usando a hora local.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: non é posíbel ler os eventos de inotify"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "Non é posíbel abrir «%s»: %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "read fallou: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -11617,16 +11728,16 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr ""
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr ""
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr ""
@@ -11706,169 +11817,166 @@ msgstr ""
 msgid "%s using polling\n"
 msgstr ""
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
-msgstr ""
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
+msgstr "Uso: %s [opción]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr ""
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr ""
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr ""
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: fstat fallou."
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s: fstat fallou."
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, c-format
 msgid "%s: can't change process priority: %m"
 msgstr ""
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr ""
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "produciuse un fallo ao reservar o búfer de saída"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr ""
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 msgid "not enough arguments"
 msgstr ""
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "produciuse un fallo ao reservar o búfer de saída"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr ""
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr ""
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr ""
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr ""
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr ""
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "tipo: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr ""
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr ""
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -11880,67 +11988,61 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr ""
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "utime fallou: (%s)"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "stat fallou: %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 msgid "is y"
 msgstr ""
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 msgid "is n"
 msgstr ""
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "a execución de %s fallou."
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, c-format
 msgid "invalid argument: %c"
 msgstr ""
@@ -11953,129 +12055,120 @@ msgid ""
 "Program not started."
 msgstr ""
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Uso: %s [opción]\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr ""
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 msgid "cannot write script file"
 msgstr ""
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "open fallou: %s"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 msgid "out of pty's"
 msgstr ""
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr ""
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "o número de bloques é demasiado pequeno"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr ""
@@ -12086,107 +12179,104 @@ msgid "Argument error."
 msgstr "Erro interno"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr ""
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "non se pode abrir %s"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 msgid "cannot force unblank"
 msgstr ""
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "Non se pode efectuar «stat» sobre o dispositivo %s"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 msgid "cannot (un)set powersave mode"
 msgstr ""
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "Non é posíbel abrir «%s» para lectura"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "Erro interno"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 msgid "Error writing screendump"
 msgstr ""
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "hexdump: non é posíbel ler %s.\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 msgid "$TERM is not defined."
 msgstr ""
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, c-format
 msgid "%s: unknown terminal type"
 msgstr ""
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12214,139 +12304,141 @@ msgstr ""
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 msgid "invalid timeout argument"
 msgstr ""
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, c-format
 msgid "invalid timeout argument: %s"
 msgstr ""
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, c-format
 msgid "can't open temporary file %s"
 msgstr ""
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "non se pode obter o tamaño de %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "non se pode obter o tamaño de %s"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr ""
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr ""
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s: fstat fallou."
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "read fallou: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "Uso: %s [opción]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 msgid "can't find your tty's name"
 msgstr ""
 
-#: term-utils/write.c:146
-msgid "you have write permission turned off."
+#: term-utils/write.c:148
+msgid "you have write permission turned off"
 msgstr ""
 
-#: term-utils/write.c:164
-#, c-format
-msgid "%s is not logged in on %s."
-msgstr ""
+#: term-utils/write.c:166
+#, fuzzy, c-format
+msgid "%s is not logged in on %s"
+msgstr "%s está montado.\t "
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, c-format
 msgid "%s has messages disabled on %s"
 msgstr ""
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "%s está montado.\t "
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, c-format
 msgid "%s has messages disabled"
 msgstr ""
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr ""
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "A liña de entrada é demasiado longa.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "malloc fallou"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Uso: %s [opción]\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -12521,7 +12613,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -12697,7 +12789,7 @@ msgstr ""
 "\n"
 "Non se encontrou o patrón\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Non se encontrou o patrón"
 
@@ -12763,7 +12855,7 @@ msgstr ""
 msgid "bad conversion character %%%s"
 msgstr "hexdump: conversión de caracteres incorrecta %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -12791,87 +12883,87 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opción ilegal -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...omitindo cara adiante\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...omitindo cara atrás\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Non hai un seguinte ficheiro"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Non hai un ficheiro anterior"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr ""
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Erro de RE: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Cadea de busca non lembrada"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Non é posíbel abrir "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "gardado"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() fallou, ténteo máis tarde\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Seguinte ficheiro: "
 
@@ -12939,8 +13031,8 @@ msgstr "Uso: %s [opción]\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -12955,39 +13047,65 @@ msgstr "%s: produciuse un erro ao abrir: %s\n"
 msgid "no input file specified"
 msgstr ""
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Uso: %s [opción]\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr ""
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Secuencia de escape descoñecida na entrada: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "A liña de entrada é demasiado longa.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Uso:\n"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Uso: %s [opción]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uso: %s [opción]\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Uso: %s [opción]\n"
 
 #~ msgid "  %s --report [devices]\n"
 #~ msgstr "  %s --report [dispositivos]\n"
diff --git a/po/hu.po b/po/hu.po
index 80c43b093..8f38b4db9 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.18-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-07-02 10:44+0200\n"
 "Last-Translator: Gabor Kelemen <kelemeng@gnome.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -106,29 +106,29 @@ msgstr "partíciós tábla újraolvasása"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "méret lekérése 512 bájtos szektorokban"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "a(z) %s nem nyitható meg"
@@ -210,7 +210,7 @@ msgid "Verifying ... "
 msgstr "Ellenőrzés ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Nem nyitható meg a(z) „%s” fájl"
@@ -252,15 +252,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -273,7 +273,7 @@ msgstr "%s a(z) %s csomagból\n"
 msgid "cannot stat file %s"
 msgstr "a(z) „%s” eszköz nem érhető el"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -322,8 +322,8 @@ msgid "stat failed: %s"
 msgstr "az elérés meghiúsult: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "a megnyitás meghiúsult: %s"
@@ -546,55 +546,55 @@ msgstr "érvénytelen fájladateltolás"
 msgid "compiled without -x support"
 msgstr "a program a -x támogatása nélkül lett lefordítva"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Rendben\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Használat: %s [-larvsmf] /dev/név\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s csatolva van.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Valóban folytatni akarja?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "ellenőrzés megszakítva.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zónaszám < ELSŐZÓNA a(z) „%s” fájlban."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zónaszám >= ZÓNA a(z) „%s” fájlban."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "A blokk eltávolítása"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Olvasási hiba: nem lehet a blokkra pozicionálni a(z) „%s” fájlban\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Olvasási hiba: hibás blokk a(z) „%s” fájlban\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -603,297 +603,297 @@ msgstr ""
 "Belső hiba: kísérlet hibás blokk írására\n"
 " Az írási kérés figyelmen kívül maradt\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "a pozicionálás meghiúsult a write_block-ban"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Írási hiba: hibás blokk a(z) „%s” fájlban\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "a pozicionálás meghiúsult a write_super_block-ban"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "a szuperblokk nem írható"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Az inode térkép nem írható"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "A zónatérkép nem írható"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Az inode-ok nem írhatók"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "nem lehet puffert lefoglalni a szuperblokknak"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "a szuperblokk nem olvasható"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "hibás bűvös szám a szuperblokkban"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Csak 1k blokk/zóna támogatott"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "hibás s_imap_blocks mező a szuperblokkban"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "hibás s_zmap_blocks mező a szuperblokkban"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Nem foglalható le puffer az inode térképnek"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Nem foglalható le puffer a zónatérképnek"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Nem foglalható le puffer az inode-oknak"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Nem foglalható le puffer a inode-ok számlálójának"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Nem foglalható le puffer a zóna számlálójának"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Az inode térkép nem olvasható"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "A zónatérkép nem olvasható"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Az inode-ok nem olvashatók"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Figyelmeztetés: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inode\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blokk\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Első adatzóna=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zónaméret=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Max. méret=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Fájlrendszer állapota=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "névhossz=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "A(z) %d inode nem használtként van megjelölve, de a(z) „%s” fájl használja\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Megjelölés használtként"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "A(z) „%s” fájl módja: %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Figyelmeztetés: az inode szám túl nagy.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "a gyökér inode nem könyvtár"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "A blokk már használatban volt. Most a(z) „%s” fájlban van."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Törlés"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "A(z) %d blokk a(z) „%s” fájlban nem használtként van megjelölve."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Javítás"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "A(z) „%s” könyvtár hibás inode-számot tartalmaz a „%.*s” fájlhoz."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Eltávolítás"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: hibás könyvtár: a „.” nem az első\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: hibás könyvtár: a „..” nem a második\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "belső hiba"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: hibás könyvtár, a méret < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "a pozicionálás meghiúsult a bad_zone-ban"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "A(z) %d. inode módja nem került törlésre."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 "A(z) %d. inode nincs használatban, a bittérképen megjelölve használtként."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr ""
 "A(z) %d. inode használatban, a bittérképen megjelölve használaton kívüliként."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Beállítás"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "%d. inode (mód = %07o), i_nlinks=%d, számlált=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "A i_nlinks beállítása a számra"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "A(z) %d. zóna használtként van megjelölve, de egy fájl sem használja."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Megjelölés törlése"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "%d. zóna: használatban, számlált=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "%d. zóna: nincs használatban, számlált=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "hibás inode méret"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "hibás v2 inode méret"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "az interaktív helyreállításhoz terminál szükséges"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "A(z) %s tiszta, nem kerül ellenőrzésre.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Fájlrendszer-ellenőrzés kényszerítése a következőn: „%s”.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "A(z) %s fájlrendszere nem tiszta, ellenőrizni kell.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -902,12 +902,12 @@ msgstr ""
 "\n"
 "%6ld inode használatban (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zóna használatban (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -930,7 +930,7 @@ msgstr ""
 "------\n"
 "%6d fájl\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1054,7 +1054,7 @@ msgstr "túl sok inode, a maximum 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "nincs elég hely, legalább %llu blokk szükséges"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Eszköz: %s\n"
@@ -1230,10 +1230,8 @@ msgstr "%6.2f%% (%+ld bájt)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Hiba a fájl lezárásakor\n"
+msgid "cannot close file %s"
+msgstr "Nem nyitható meg a(z) „%s” fájl"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1346,88 +1344,98 @@ msgstr ""
 "FIGYELMEZTETÉS: az eszközszámok %u bitre csonkítva. Ez majdnem biztosan azt\n"
 "jelenti, hogy bizonyos eszközfájlok hibásak lesznek.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Használat: %s [-c | -l fájlnév] [-nXX] [-iXX] /dev/név [blokkok]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "a(z) %s csatolva van, itt nem lesz létrehozva fájlrendszer!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "a rendszerindító blokkra pozicionálás meghiúsult a write_tables-ben"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "a rendszerindító szektort nem lehet törölni"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "a pozicionálás sikertelen a write_tables-ben"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "a szuperblokk nem írható"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "az inode térkép nem írható"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "a zónatérkép nem írható"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "az inode-ok nem írhatók"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "a pozicionálás meghiúsult a write_block-ban"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "az írás meghiúsult a write_block-ban"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "túl sok hibás blokk"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "nincs elég jó blokk"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "nem lehet puffert lefoglalni a szuperblokknak"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "nem lehet puffereket lefoglalni a térképeknek"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "nem lehet puffereket lefoglalni az inode-oknak"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inode\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blokk\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1436,98 +1444,98 @@ msgstr ""
 "Max. méret=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "a pozicionálás meghiúsult a blokkok tesztelése közben"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Szokatlan értékek a do_check-ben: ez valószínűleg hibát jelez\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "a pozicionálás meghiúsult a check_blocks-ban"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "hibás blokkok az adatterület előtt: nem lehet létrehozni a fájlrendszert"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d hibás blokk\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "egy hibás blokk\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "nem nyitható meg a hibás blokkok fájlja"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "bemeneti hiba a hibás blokkok számánál a(z) %d. sorban\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "hibás blokkok fájlja nem olvasható"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "hibás inode méret"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol hiba: a blokkok száma nincs meghatározva"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s meghiúsult.\n"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "az openpty meghiúsult\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "mount: a(z) %s foglalt"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "a blokkméret kisebb, mint a fizikai szektorméret (%s)"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "a(z) %s mérete nem állapítható meg"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "a(z) „%s” eszközön nem történik kísérlet a fájlrendszer létrehozására"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "a blokkok száma túl kicsi"
@@ -1863,7 +1871,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "a pozicionálás sikertelen a write_tables-ben"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2211,7 +2219,7 @@ msgid "   Logical"
 msgstr "   Logikai"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -2870,12 +2878,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD lemezcímke parancs (m = súgó): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Első %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Utolsó %s vagy +méret vagy +méretM vagy +méretK"
@@ -3022,7 +3030,7 @@ msgid "tracks/cylinder"
 msgstr "cilinderenkénti sávok"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cilinderek"
 
@@ -3092,12 +3100,12 @@ msgstr "A létrehozott partíciók száma elérte a maximumot\n"
 msgid "This partition already exists.\n"
 msgstr "Ez a partíció már létezik.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Figyelmeztetés: túl sok partíció (%d, a maximum: %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3300,7 +3308,7 @@ msgstr "Beállítandó"
 msgid "heads"
 msgstr "fejek"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "szektorok"
 
@@ -3734,7 +3742,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Indítás   Eleje         Vége      Blokkok  Az  Rendszer\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Eszköz"
 
@@ -3820,7 +3828,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld szektor nincs lefoglalva\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3976,37 +3984,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Adatok kiírása a lemezekre.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "A(z) %d. partíciónak nincs adatterülete\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Az adatok új kezdete"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Szakértői parancs (m = súgó): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Cilinderek száma"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Fejek száma"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Szektorok száma"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Figyelmeztetés: a szektoreltolás beállítása DOS-kompatibilitis módra\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4019,34 +4027,34 @@ msgstr ""
 "fdisk segédprogram nem támogatja a GPT-t. Használja a GNU parted programot.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "A(z) %s lemez nem tartalmaz érvényes partíciós táblát\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "A(z) „%s” nem nyitható meg\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "a(z) „%s” nem nyitható meg\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ismeretlen parancs\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Ez a rendszermag a szektorméretet önállóan állapítja meg - a -b kapcsoló "
 "figyelmen kívül maradt\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4055,17 +4063,17 @@ msgstr ""
 "Figyelmeztetés: a -b (szektorméret beállítása) kapcsolóhoz meg kell adni egy "
 "eszközt\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "OSF/1 lemezcímke található a(z) %s eszközön, lemezcímke módra váltás.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Parancs (m = súgó): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4074,16 +4082,16 @@ msgstr ""
 "\n"
 "Az aktuális indítófájl: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Adja meg az új indítófájl nevét: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Az indítófájl változatlan\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4401,9 +4409,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tSzokatlan indítófájl nevet választott.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Elnézést, megváltoztathatja nem üres partíciók címkéjét.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Elnézést, csak a rendszergazda módosíthatja a rendszerórát.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4420,7 +4428,7 @@ msgstr ""
 "Írja be az IGEN szót, ha biztosan eltérő módon kívánja címkézni ezt a "
 "partíciót.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "IGEN\n"
 
@@ -4618,7 +4626,7 @@ msgstr "Nem használt hézag a 0-%d szektorokon\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nem használt hézag a(z) %d-%d szektorokon\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4627,7 +4635,7 @@ msgstr ""
 "A többi partíció már lefedi a teljes lemezt.\n"
 "Töröljön vagy zsugorítson össze néhányat az újrapróbálkozás előtt.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4636,12 +4644,12 @@ msgstr ""
 "Erősen ajánlott, hogy a 11. partíció\n"
 "lefedje az egész lemezt és 'SGI kötet' típusú legyen.\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "A(z) %d. szektor már le van foglalva\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4651,7 +4659,7 @@ msgstr ""
 "Nem foglalta le a teljes lemezt a 3. partícióval, de a(z) %d %s érték\n"
 "lefoglal egy másik partíciót. A bejegyzése módosítva %d %s értékre.\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4660,7 +4668,7 @@ msgstr ""
 "Ha fenn akarja tartani a SunOS/Solaris kompatibilitást, akkor hagyja a\n"
 "partíciót teljes lemezként (5), a 0. szektortól %u szektorral\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4674,7 +4682,7 @@ msgstr ""
 "Írja be az IGEN szót, ha a partíció biztosan 82-es (Linux lapozó)\n"
 "típusú legyen: "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4695,7 +4703,7 @@ msgstr ""
 "Egység = %s, összesen %d * 512 bájt\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4708,28 +4716,28 @@ msgstr ""
 "Egység = %s, összesen %d * 512 bájt\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Jelző   Kezdet      Vége   Blokkok  Az  Rendszer\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Az alternatív cilinderek száma"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Cilinderenkénti extra szektorok"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Átrendezési tényező"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Forgási sebesség (percenkénti fordulat)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "A fizikai cilinderek száma"
 
@@ -5190,7 +5198,7 @@ msgstr "%s lemez: nem kérhető le a geometria\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "%s lemez: nem kérhető le a méret\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5201,23 +5209,23 @@ msgstr ""
 "lemeznek. Az fdisk használata valószínűleg értelmetlen. [Ha valóban\n"
 "ezt akarja, akkor a --force kapcsolóval teheti meg]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Figyelmeztetés: a HDIO_GETGEO %lu fej jelenlététét jelzi\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Figyelmeztetés: a HDIO_GETGEO %lu szektor jelenlététét jelzi\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "Figyelmeztetés: a BLKGETSIZE/HDIO_GETGEO %lu cilinder jelenlététét jelzi\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5227,7 +5235,7 @@ msgstr ""
 "legfeljebb 63. Ez a problémákat fog okozni az összes C/H/S címzést\n"
 "használó szoftverben.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5236,7 +5244,7 @@ msgstr ""
 "\n"
 "%s lemez: %lu cilinder, %lu fej, %lu szektor sávonként\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5244,7 +5252,7 @@ msgstr ""
 "A(z) $%2s partíció $%1s értéke lehetetlen fejszámot ad meg: $%3lu (0-$%4lu "
 "között kellene lennie)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5253,7 +5261,7 @@ msgstr ""
 "A(z) $%2s partíció $%1s értéke lehetetlen szektorszámot ad meg: $%3lu (0-$"
 "%4lu között kellene lennie)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5262,7 +5270,7 @@ msgstr ""
 "A(z) $%2s partíció $%1s értéke lehetetlen cilinderszámot ad meg: $%3lu (0-$"
 "%4lu között kellene lennie)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5271,12 +5279,12 @@ msgstr ""
 "Azonosító  Név\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "A partíciós tábla újraolvasása ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5286,26 +5294,26 @@ msgstr ""
 "A partíciós tábla újraolvasás parancsa meghiúsult\n"
 "Indítsa újra most a rendszert az mkfs használata előtt\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Hiba a(z) %s lezárásakor\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: nincs ilyen partíció\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "ismeretlen formátum - a szektorok kerülnek felhasználásra\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "megvalósítatlan formátum - a(z) %s kerül felhasználásra\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5314,12 +5322,12 @@ msgstr ""
 "Egység = %lu bájtos cilinderek, 1024 bájtos blokkok, kezdősorszám: %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "  Eszköz Indítás Kezdet Vége    #cill    #blokk   Az  Rendszer\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5328,12 +5336,12 @@ msgstr ""
 "Egység = 512 bájtos szektorok, kezdősorszám: %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "  Eszköz Indítás Kezdet      Vége   #szektor  Az Rendszer\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5342,12 +5350,12 @@ msgstr ""
 "Egység = 1024 bájtos blokkok, kezdősorszám: %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "  Eszköz Indítás  Kezdet    Vége     #blokk   Az  Rendszer\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5356,31 +5364,31 @@ msgstr ""
 "Egység = 1048576 bájtos mebibájt, 1024 bájtos blokkok, kezdősorszám: %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "Eszköz Indítás Kezdet Vége    MiB   #blokkok   Az  Rendszer\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tkezdet: (c,h,s) várt: (%ld,%ld,%ld) talált: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tvége: (c,h,s) várt: (%ld,%ld,%ld) talált: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a partíció a(z) %ld cilinderen végződik, a lemez vége után\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Nem találhatók partíciók\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5391,52 +5399,42 @@ msgstr ""
 "  C/H/S=*/%ld/%ld értékekhez készült (%ld/%ld/%ld helyett).\n"
 "Ehhez a listához ez lesz a feltételezett geometria.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "nincs jelen partíciós tábla.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "furcsa, csak %d partíció van megadva.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Figyelmeztetés: a(z) %s partíció mérete 0, de nincs üresként megjelölve\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Figyelmeztetés: a(z) %s partíció mérete 0 és indítható\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Figyelmeztetés: a(z) %s partíció mérete 0 és nem nulláról indul\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Figyelmeztetés: %s partíció "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "nem része a(z) %s partíciónak\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Figyelmeztetés: %s partíció "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "és a(z) %s átfedik egymást\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Figyelmeztetés: a(z) %d. partíció üres\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5445,17 +5443,17 @@ msgstr ""
 "Figyelmeztetés: a(z) %s tartalmazza a partíciós tábla egy részét\n"
 "(%lu. szektor) és megsemmisíti azt a kitöltéskor\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Figyelmeztetés: a(z) %s partíció a 0. szektornál kezdődik\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Figyelmeztetés: a(z) %s partíció túlnyúlik a lemezen\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5463,17 +5461,17 @@ msgstr ""
 "Az elsődleges partíciók közül legfeljebb egy lehet kiterjesztett\n"
 "(noha ez Linux alatt nem probléma)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Figyelmeztetés: a(z) %s partíció nem cilinderhatáron kezdődik.\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Figyelmeztetés: a(z) %s partíció nem cilinderhatáron végződik.\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5482,7 +5480,7 @@ msgstr ""
 "Ez nem probléma a LILO-nak, de a DOS MBR nem fog elindulni erről a "
 "lemezről.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5490,7 +5488,7 @@ msgstr ""
 "Figyelmeztetés: általában csak elsődleges partícióról lehet rendszert\n"
 "indítani. A LILO nem veszi figyelembe az „indítható” jelzőt.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5500,11 +5498,11 @@ msgstr ""
 "Ez nem probléma a LILO-nak, de a DOS MBR nem fog elindulni erről a "
 "lemezről.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "kezdet"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5512,23 +5510,23 @@ msgstr ""
 "%s partíció: kezdete: (c,h,s) a várt (%ld,%ld,%ld) helyett\n"
 "(%ld,%ld,%ld) található\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "vég"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "%s partíció: vége: (c,h,s) a várt (%ld,%ld,%ld) helyett\n"
 "(%ld,%ld,%ld) található\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a partíció (%s) a(z) %ld. cilinderen végződik, a lemez vége előtt\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5537,7 +5535,7 @@ msgstr ""
 "Figyelmeztetés: a kiterjesztett partíció kezdete eltolva: %ld -> %ld\n"
 "(Csak kiíratáshoz. Ne változtassa meg a tartalmát.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5545,133 +5543,133 @@ msgstr ""
 "Figyelmeztetés: a kiterjesztett partíció nem cilinderhatárnál kezdődik.\n"
 "A DOS és Linux a tartalmát eltérően fogja értelmezni.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "túl sok partíció - a(z) %d. utániak figyelmen kívül maradnak\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "partíciófa?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "az érzékelt Disk Manager nem kezelhető\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 aláírást található - feladom\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "furcsa... a kiterjesztett partíció mérete 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "furcsa... a BSD partíció mérete 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: azonosítatlan partícióstábla-típus\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "megadta a -n kapcsolót: Semmi sem módosult\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Nem sikerült elmenteni a régi szektorokat - megszakítás\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Nem sikerült a partíció kiírása a(z) %s eszközön\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "hosszú vagy hiányos bemeneti sor - kilépés\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "bemeneti hiba: a(z) %s mezőt „=” jelnek kellene követnie\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "bemeneti hiba: váratlan karakter (%c) a(z) %s mező után\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "azonosítatlan bemenet: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "a szám túl nagy\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "befejező szemét egy szám után\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "nincs hely a partícióleírónak\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "nem lehet felépíteni a körülvevő kiterjesztett partíciót\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "túl sok bemeneti mező\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Nincs hely több elem számára\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Érvénytelen típus\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Figyelmeztetés: a megadott méret (%lu) túllépte az engedélyezhető legnagyobb "
 "méretet (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Figyelmeztetés: üres partíció\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Figyelmeztetés: hibás a partíció kezdete (legelső %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "azonosítatlan indítható jelző - válassza a - vagy * egyikét\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "részleges c,h,s meghatározás?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "A kiterjesztett partíció nem a várt helyen van\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "hibás bemenet\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "túl sok partíció\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5682,100 +5680,180 @@ msgstr ""
 "Általában csak a <kezdet> és a <méret> megadása szükséges (és néha a "
 "<típus>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+msgstr "Használat:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "eszköz: /dev/hda, /dev/sda vagy ezekhez hasonló eszköznév"
+msgid " %s [options] <device> [...]\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d partíció:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "Veszélyes kapcsolók:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -g [vagy --show-geometry]: kiírja a geometriát a partíciós tábla alapján"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [vagy --show-extended]: felsorolja a kibővített partíciókat is\n"
+"                                 vagy leírókat vár hozzájuk a bemenetről"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Használat:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s eszköz\t\t az eszköz aktív partícióinak felsorolása\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s eszköz n1 n2...  az n1... partíciók aktiválása, a többi deaktiválása\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An eszköz\t az n. partíció aktiválása, a többi deaktiválása\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5789,62 +5867,62 @@ msgstr ""
 "programot.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Ezt az ellenőrzést a --force kapcsoló segítségével bírálhatja felül.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "nincs parancs?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "összesen: %llu blokk\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "használat: sfdisk --print-id eszköz partíciószám\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "használat: sfdisk --change-id eszköz partíciószám azonosító\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "használat: sfdisk --id eszköz partíciószám [azonosító]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "csak egy eszköz adható meg (kivéve a -l vagy -s kapcsolót)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "a(z) %s nem nyitható meg írásra és olvasásra\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "a(z) %s nem nyitható meg olvasásra\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilinder, %ld fej, %ld sáv szektoronként\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Nem kérhető le a(z) %s mérete\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hibás aktív bájt: 0x%x a 0x80 helyett\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5852,7 +5930,7 @@ msgstr ""
 "Kész\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5863,36 +5941,36 @@ msgstr ""
 "MBR csak a pontosan egy aktív partíciót tartalmazó lemezről képes "
 "elindulni.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "a(z) %s partíció azonosítója %x és nem rejtett\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Hibás azonosító: %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "A lemez jelenleg használatban van.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Végzetes hiba: a(z) „%s” nem található\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Figyelmeztetés: a(z) %s nem blokkeszköz\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "Ellenőrzésre kerül, hogy pillanatnyilag senki sem használja a lemezt...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5905,30 +5983,30 @@ msgstr ""
 "lapozópartíciók kikapcsolásához. Használja a --no-reread kapcsolót ezen\n"
 "ellenőrzés letiltásához.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Használja a --force kapcsolót az összes ellenőrzés felülbírálásához.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "Rendben\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Régi helyzet:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "A(z) %d. partíció nem létezik, nem lehet módosítani\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Új helyzet:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5936,21 +6014,21 @@ msgstr ""
 "Nem szeretem ezeket a partíciókat - semmit sem változott.\n"
 "(Ha tényleg ezt akarja, használja a --force kapcsolót.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Nem szeretem ezt - Ajánlott a Nem válasz\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Elégedett ezzel? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Valóban lemezre akarja ezt írni? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5959,16 +6037,16 @@ msgstr ""
 "\n"
 "sfdisk: idő előtt vége a bemenetnek\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Kilépés - semmi sem változott\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Az y, n, q (igen, nem, kilépés) egyikével válaszoljon\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5977,7 +6055,7 @@ msgstr ""
 "Az új partíciós tábla sikeresen kiírva\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6009,101 +6087,103 @@ msgstr "Adatok kiírása a lemezekre.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s sikeres.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s meghiúsult.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: %s nem nyitható meg: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s nem található"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "hiba a(z) %s írásakor: %s"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: a(z) %s nem egy párhuzamos (lp) eszköz.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Fájlrendszer-ellenőrzés kényszerítése a következőn: „%s”.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6111,58 +6191,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: a(z) %s nem egy párhuzamos (lp) eszköz.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Nem nyitható meg a következő: %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s leválasztva\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "A megmaradt fájlrendszerek leválasztása..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "A megmaradt fájlrendszerek leválasztása..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: ismeretlen argumentum: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6181,33 +6261,87 @@ msgstr "üres hosszú kapcsoló a -l vagy --long paraméter után"
 msgid "unknown shell after -s or --shell argument"
 msgstr "ismeretlen parancsértelmező a -s vagy --shell paraméter után"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+"       getopt [kapcsolók] -o|--options kapcsoló-karakterlánc [kapcsolók] "
+"[--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative                Engedélyezi a kötőjellel kezdődő hosszú\n"
+"                                     kapcsolókat\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                       Ez a súgószöveg\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
 msgstr ""
+"  -l, --longoptions=hosszú_kapcsolók    Felismerendő hosszú kapcsolók\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=programnév            A hibák ezen név alatt kerülnek "
+"jelentésre\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=kapcsoló-karakterlánc  Felismerendő rövid kapcsolók\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                      A hibajelentés letiltása a getopt(3)-nak\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output               Nincs normál kimenet\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=parancsértelmező     A parancsértelmező idézési "
+"megállapodásainak\n"
+"                                     beállítása\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                       A getopt(1) verzió tesztelése\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                     Nem idézőjelezi a kimenetet\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                    Verzióinformációk kiírása\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "hiányzó kapcsoló-karakterlánc paraméter"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "belső hiba, vegye fel a kapcsolatot a szerzővel."
 
@@ -6669,93 +6803,111 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Nem lehet beállítani az epoch értéket a rendszermagban.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d partíció:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                megadja a hwclocknak a használt alpha gép típusát\n"
 "                  (lásd a hwclock(8) kézikönyvoldalt)\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Nem lehet a megfigyelőrendszerhez csatlakozni.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "A(z) %s nem vár nem kapcsoló paramétereket. A következőt adta meg: %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6764,7 +6916,7 @@ msgstr ""
 "Több műveletet adott meg egyszerre.\n"
 "Egyszerre csak egy művelet használható.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6773,7 +6925,7 @@ msgstr ""
 "%s: Az --utc és a --locatime kölcsönösen kizárják egymást.\n"
 "Mégis mindkettőt megadta.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6782,7 +6934,7 @@ msgstr ""
 "%s: Az --adjust és a --noadjfile kölcsönösen kizárják egymást.\n"
 "Mégis mindkettőt megadta.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6791,29 +6943,29 @@ msgstr ""
 "%s: Az --adjfile és a --noadjfile kölcsönösen kizárják egymást, de "
 "mindkettőt megadta.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: A --noadjfile kapcsolóval használnia kell a --utc vagy --localtime "
 "egyikét\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Nem használható a beállítandó idő. Az óra nem állítható be.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Elnézést, csak a rendszergazda módosíthatja a hardverórát.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Elnézést, csak a rendszergazda módosíthatja a rendszerórát.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6821,12 +6973,12 @@ msgstr ""
 "Elnézést, csak a rendszergazda módosíthatja a hardveróra epoch értékét a "
 "rendszermagban.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "A hardveróra egyetlen ismert módon sem érhető el.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7015,7 +7167,7 @@ msgid "failed to read mtab"
 msgstr "A(z) %s nem olvasható\n"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr ""
 
@@ -7056,45 +7208,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7103,27 +7295,27 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: a csatolás meghiúsult"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "nem foglalható le kimeneti puffer"
@@ -7213,7 +7405,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: jelszó-hitelesítési (PAM) hiba, megszakítva: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Jelszó: "
 
@@ -7668,47 +7860,48 @@ msgstr "TÚL SOK soremelés"
 msgid "too many bare linefeeds."
 msgstr "túl sok üres soremelés.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "A bejelentkezés %d másodperc után túllépte az időkorlátot\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Utolsó bejelentkezés: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "erről: %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "ezen: %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "a szabványos kimenetre írás meghiúsult"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "BEJELENTKEZÉSI HIBA ERRŐL: %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "BEJELENTKEZÉSI HIBA EZEN: %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d BEJELENTKEZÉSI HIBA ERRŐL: %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d BEJELENTKEZÉSI HIBA EZEN: %s, %s"
@@ -7738,7 +7931,7 @@ msgstr "mount: hozzáférés megtagadva"
 msgid "setuid failed"
 msgstr "a setuid() hívása meghiúsult"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "a végrehajtás meghiúsult\n"
@@ -7785,8 +7978,8 @@ msgstr ""
 "%s: a(z) %s zárolása nem oldható fel: %s (a változtatásai még mindig a "
 "következőben vannak: %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "az indítás meghiúsult\n"
@@ -7839,24 +8032,21 @@ msgstr "érvénytelen évérték: használjon 1-9999 közötti értéket"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Használat: cal [-13smjyV] [[[nap] hónap] év]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7968,32 +8158,32 @@ msgstr " Eltávolítás"
 msgid "failed to add line to output"
 msgstr ""
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "az első sor után"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "Nem foglalható le puffert.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: nem olvasható a(z) %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "Nem foglalható le puffert.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "a memóriafoglalás sikertelen"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8004,49 +8194,74 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Elérhető parancsok:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8055,40 +8270,40 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "ismeretlen erőforrástípus: %s\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr ""
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr ""
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr ""
 
@@ -8112,12 +8327,12 @@ msgstr "%s: a(z) „%s” folyamat nem található\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: ismeretlen jelzés: %s; az érvényes jelzések:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Használat: %s [ -s jelzés | -p ] [ -a ] folyamatazonosító ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ jelzés ]\n"
@@ -8137,84 +8352,83 @@ msgstr "Blokkméret: %d\n"
 msgid "connect %s"
 msgstr "n.szám"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "foglalat"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "n.szám"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Következő fájl: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Az érték kívül esik a tartományon.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: ismeretlen szolgáltatásnév: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: ismeretlen prioritásnév: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8354,7 +8568,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8372,12 +8586,13 @@ msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8385,7 +8600,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8408,7 +8623,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8417,33 +8632,33 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Nem nyitható meg a következő: %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%d bájt érkezett a következőtől: %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "a végrehajtás meghiúsult\n"
@@ -8463,24 +8678,12 @@ msgstr "a(z) „%s” nem érhető el"
 msgid "%s - No such file or directory\n"
 msgstr "a gyökér inode nem könyvtár"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "Használat: namei [-mx] útvonal [útvonal ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d partíció:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8492,8 +8695,8 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, fuzzy, c-format
+#: misc-utils/namei.c:425
+#, fuzzy
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8501,12 +8704,12 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "A --date paramétere túl hosszú\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8516,169 +8719,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: a(z) %s átnevezése meghiúsult a következőre: %s: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: hibás -l kapcsoló: %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "írás"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "időtúllépés"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "shutdown: Nem lehet leválasztani a következőt: %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Nem lehet zárolni a(z) %s zárolási fájlt: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "Nem találhatók partíciók\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "érvénytelen kapcsoló"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "hiba a(z) %s módjának módosításakor: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8686,29 +8887,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8742,32 +8942,33 @@ msgid "%s: write failed"
 msgstr "%s meghiúsult.\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "bájt"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Érvénytelen beállított érték: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8776,11 +8977,11 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8879,63 +9080,63 @@ msgstr "hiba a(z) %s tulajdonosának módosításakor: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s nem nevezhető át %s névre: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: a /dev könyvtár nem létezik."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: nem kaphatók információk a(z) %s eszközről: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", eltolás: %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", méretkorlát: %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", %s titkosítás (típus: %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", eltolás: %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", titkosítástípus: %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: nem kaphatók információk a(z) %s eszközről: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: nem nyitható meg a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: nincs jogosultsága a /dev/loop# megjelenítéséhez"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: nem található szabad hurokeszköz"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8945,58 +9146,56 @@ msgstr ""
 "       ismeri a hurokeszközt?. (fordítsa újra a rendszermagot vagy\n"
 "       adja ki a „modprobe loop” parancsot.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Elfogyott a memória a puffer növelésekor.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "figyelmeztetés: a(z) %s már társítva van a következőhöz: %s\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: a(z) %2$s%1$s írásvédett, csatolás csak olvashatóként"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nem lehet zárolni a memóriába, kilépés.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "A LOOP_SET_FD ioctl meghiúsult: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): siker\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): siker\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: nem törölhető a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Ez a „mount” parancs hurokeszköz-támogatás nélkül lett lefordítva. Fordítsa "
 "újra.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9004,7 +9203,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Használat:\n"
@@ -9016,19 +9215,17 @@ msgstr ""
 "felsorolása\n"
 " %1$s [ kapcsolók ] {-f|--find|hurokeszköz} fájl   beállítás\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9044,33 +9241,33 @@ msgstr ""
 " -v | --verbose            részletes mód\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: nem nyitható meg a(z) %s eszköz: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 "mount: a(z) %s hurokeszközt egy másik folyamat ellopta... újrapróbálom\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "mount: a(z) %s foglalt"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9648,14 +9845,17 @@ msgstr "hiba az xstrndup hívásban"
 msgid "not enough memory"
 msgstr "nincs elég memória"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "A <speciális> paraméter:\n"
@@ -9665,177 +9865,161 @@ msgstr ""
 " <fájl>                               a használandó fájl neve\n"
 "\n"
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Használat:\n"
-" %1$s -a [-e] [-v]                  az /etc/fstab minden lapozóterületének\n"
-"                                      bekapcsolása\n"
-" %1$s [-p prioritás] [-v] <speciális>  adott lapozóterület bekapcsolása\n"
-" %1$s -s                            lapozóterület-használat összegzésének\n"
-"                                      megjelenítése\n"
-" %1$s -h                            súgó megjelenítése\n"
-" %1$s -V                            verzió megjelenítése\n"
-"\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Használat:\n"
-" %1$s -a [-v]                      minden lapozóterület kikapcsolása\n"
-" %1$s [-v] <speciális>             adott lapozóterület kikapcsolása\n"
-" %1$s -h                           súgó megjelenítése\n"
-" %1$s -V                           verzió megjelenítése\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: %s: váratlan fájlformátum\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, fuzzy, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 "%s: %s: szoftveres felfüggesztési adatok találhatók. A lapozóterület "
 "ismételt előkészítése.\n"
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "a végrehajtás meghiúsult\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "a setuid() hívása meghiúsult"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "%s: az lseek meghiúsult"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "a szabványos kimenetre írás meghiúsult"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Név"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: figyelmeztetés: a(z) %s jogosultságai (%04o) nem biztonságosak, a "
 "javasolt érték: %04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 "%s: figyelmeztetés: a(z) %s jogosultságai (%04o) nem biztonságosak, a "
 "javasolt érték: %04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: A(z) %s fájl kihagyása - úgy tűnik, lyukak vannak benne.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, fuzzy, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s: %s: szoftveres felfüggesztési adatok találhatók. A lapozóterület "
 "ismételt előkészítése.\n"
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s a következőn: %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s meghiúsult.\n"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: nem található a(z) %s eszköze\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "Nem rendszergazda.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s meghiúsult.\n"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10114,7 +10298,7 @@ msgstr "%d. partíció kiválasztva\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10174,19 +10358,13 @@ msgstr "        (%s partíciós tábla észlelve). "
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "A(z) %s lemez nem tartalmaz érvényes partíciós táblát\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10197,21 +10375,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Elérhető parancsok:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10220,26 +10397,26 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "Nem foglalható le puffert.\n"
@@ -10367,7 +10544,7 @@ msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 msgid "failed to set pid %d's policy"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "a típusparancsfájl (%s) olvasása meghiúsult"
@@ -10640,7 +10817,7 @@ msgstr ""
 msgid "Can't set signal handler"
 msgstr "Nem állítható be a jelzéskezelő"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "a gettimeofday hívás meghiúsult"
 
@@ -10649,7 +10826,7 @@ msgstr "a gettimeofday hívás meghiúsult"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Nem adható ki a CYGETMON hívás a következőn: %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10657,12 +10834,12 @@ msgstr ""
 "%s: %lu egész, %lu/%lu karakter; fifo: %lu küszöb, %lu időkorlát, %lu max, "
 "%lu most\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f  egész/mp; %f rögzítve, %f küldve (kar/mp)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10670,7 +10847,7 @@ msgstr ""
 "%s: %lu egész, %lu karakter; fifo: %lu küszöb, %lu időkorlát, %lu max, %lu "
 "most\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f egész/mp; %f rögzítve (kar/mp)\n"
@@ -10762,127 +10939,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "nem démonizálható"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Használat: %s [kapcsolók] eszköz ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Ismeretlen parancs: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "ismeretlen erőforrástípus: %s\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "az fsync meghiúsult"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "az írás meghiúsult: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "nincs parancs?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "az fsync meghiúsult"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Használat: %s%s [kapcsolók] [program [program argumentumai]]\n"
-"\n"
-"Kapcsolók:\n"
+msgid " %s [options] <filename>\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10890,7 +11047,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10899,36 +11056,36 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Túl kevés argumentum"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Érvénytelen beállított érték: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Érvénytelen beállított érték: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "A „--date” kapcsoló nincs megadva.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "a várt szám helyett „%s” található"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "a malloc meghiúsult"
@@ -10936,66 +11093,67 @@ msgstr "a malloc meghiúsult"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s egy paramétert igényel\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: %s nem nyitható meg: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: hibás érték\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "az indítás meghiúsult\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Használat: %s%s [kapcsolók] [program [program argumentumai]]\n"
 "\n"
 "Kapcsolók:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11003,37 +11161,36 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "A „--date” kapcsoló nincs megadva.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s: az elérés meghiúsult"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "a gyökér inode nem könyvtár"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11042,8 +11199,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11051,96 +11208,87 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "az időzítésfájl (%s) olvasása meghiúsult"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "A „--date” kapcsoló nincs megadva.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "a gyökér inode nem könyvtár"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s meghiúsult.\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Használat: %s [kapcsolók] eszköz ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
-msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, fuzzy, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Osztott memóriaszegmens o.m.az =%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "Üzenetsor üz.az=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "lefoglalt szemaforok = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11641,8 +11789,8 @@ msgstr ""
 "Osztott memóriaszegmens o.m.az =%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "f.az=%d\tcs.az=%d\tl.fh.az=%d\tl.cs.az=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11651,8 +11799,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mód=%#o\thozzáférési_jog=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bájt=%ld\tu.f.az=%d\tl.f.az=%d\tcsat.szám=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11685,8 +11833,8 @@ msgstr ""
 "Üzenetsor üz.az=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "f.az=%d\tcs.az=%d\tl.fh.az=%d\tl.cs.az=%d\tmód=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11719,8 +11867,8 @@ msgstr ""
 "Szemafortömb szem.az=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "f.az=%d\t cs.az=%d\t l.fh.az=%d\t l.cs.az=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11768,16 +11916,14 @@ msgstr "f.az"
 msgid "invalid iflag: %s"
 msgstr "érvénytelen azonosító: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Használat: %s [ -dhV78neo12 ] [ -s <sebesség> ] <llemez> <eszköz>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11785,7 +11931,7 @@ msgstr ""
 "\n"
 "Ismert <llemez> nevek:\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 #, fuzzy
 msgid ""
 "\n"
@@ -11794,51 +11940,51 @@ msgstr ""
 "\n"
 "Ismert <llemez> nevek:\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "érvénytelen sebesség: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach innen: %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "érvénytelen kapcsoló"
 
 # fixme: mi ez?
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "érvénytelen sorelv: %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s nem soros vonal"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem kérhetők le"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "a sebesség (%d) nem támogatott"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "a(z) %s terminálattribútumai nem állíthatók be"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "nem állítható be a sorelv"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "nem démonizálható"
 
@@ -11995,36 +12141,31 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12033,12 +12174,12 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "a gyökér inode nem könyvtár"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s csatolva van.\t"
@@ -12074,46 +12215,44 @@ msgstr ""
 "\t -n            a bájtsorrend automatikus felismerésének letiltása\n"
 "\t -V            a verziószám kiírása és kilépés\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: hiba a(z) %s írásakor: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Mintavételezési_lépés: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): hibás leképezéssor\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: nem található az „_stext” a következőben: %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 "%s: a profil címe kívül esik a tartományon. Talán hibás a leképezésfájl?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "összesen"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12128,10 +12267,7 @@ msgstr ""
 "\n"
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12140,8 +12276,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12149,69 +12285,61 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice erről: %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Ismeretlen parancs: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "hibás időkorlátérték: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "felhasználó"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: régi prioritás: %d, új prioritás: %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Használat: %s [kapcsolók] eszköz ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "Használat: %s [kapcsolók]\n"
 "    -d | --device <eszköz>     rtc eszköz kiválasztása (rtc0|rtc1|...)\n"
@@ -12223,8 +12351,8 @@ msgstr ""
 "    -v | --verbose             részletes üzenetek\n"
 "    -V | --version             verziószám megjelenítése\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12232,162 +12360,162 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "rtc idő olvasása"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "rendszeridő olvasása"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "rtc idő átalakítása"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "rtc riasztás beállítása"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "rtc riasztás engedélyezése"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "rtc ébresztési riasztás beállítása"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "rtc riasztás engedélyezése"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "rtc idő átalakítása"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "%s: ismeretlen felfüggesztési állapot: „%s”\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "a(z) „%s” nem nyitható meg: %s"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: a következő megnyitása meghiúsult: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: feltételezem, hogy az RTC UTC-t használ ...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC idő használata.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Helyi idő használata.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s: meg kell adnia a felébresztési időt\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: a(z) %s nem támogatja az ébresztési eseményeket\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "%ld. riasztás, rendszeridő: %ld, rtc idő: %ld, %u másodperc\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, fuzzy, c-format
 msgid "time doesn't go backward to %s"
 msgstr "%s: az idő nem megy vissza eddig: %s\n"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: ébresztés a(z) „%s” eszközről %s segítségével ekkor: %s\n"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: ébresztés a(z) „%s” eszközről %s segítségével ekkor: %s\n"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "a típusparancsfájl (%s) olvasása meghiúsult"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "az olvasás meghiúsult: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 #, fuzzy
 msgid "disable rtc alarm interrupt failed"
 msgstr "rtc riasztási megszakítás letiltása"
@@ -12462,16 +12590,16 @@ msgstr ""
 "%s: %s\n"
 "További információkért adja ki a „%s --help” parancsot.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: ismeretlen architektúra"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Túl kevés argumentum"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "A személyiség beállítása meghiúsult a következőre: %s"
@@ -12557,24 +12685,22 @@ msgstr "%s a(z) %d. megszakítást használja\n"
 msgid "%s using polling\n"
 msgstr "%s lekérdezést használ\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "Használat: %s program [argumentum ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12582,150 +12708,150 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "a csoportazonosító nem állítható be"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "a felhasználóazonosító nem állítható be"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: a(z) %s nem futtatható: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s: a(z) %s nem futtatható: %m"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: a(z) „%s” folyamat nem található\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: a(z) %s nem futtatható: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "nem foglalható le kimeneti puffer"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "hibás időkorlátérték: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Túl kevés argumentum"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "nem foglalható le kimeneti puffer"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "hibás sebesség: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "túl sok alternatív sebesség"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: nem nyitható meg szabványos bemenetként: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: nem egy karaktereszköz"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: nem nyitható meg írásra vagy olvasásra"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: kettőzési probléma: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "típus: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: olvasás: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: a bemenet túlcsordult"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12737,69 +12863,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "felhasználó"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "felhasználó"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "a pozicionálás meghiúsult"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "az elérés meghiúsult: %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "most igen\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "most nem\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "lefoglalt szemaforok = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "érvénytelen azonosító: %s\n"
@@ -12815,52 +12935,46 @@ msgstr ""
 "Használja a(z) „%s [kapcsolók] %s” parancsot, ha valóban\n"
 "használni akarja. A parancsfájl nem indult el.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "nem nyitható meg az időzítésfájl (%s)"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "A parancsfájl elindult, a fájl: %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "A parancsfájl elindult ekkor: %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: nem írható a parancsfájl, hiba: %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12869,79 +12983,76 @@ msgstr ""
 "\n"
 "A parancsfájl kész ekkor: %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "A parancsfájl kész, a fájl: %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "az openpty meghiúsult\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Elfogytak a pszeudoterminálok\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <időzítésfájl> [<típusparancsfájl> [<elválasztó>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "a várt szám helyett „%s” található"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "„%s” elválasztó"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "a szabványos kimenetre írás meghiúsult"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "váratlan fájlvége a következőn: %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "a típusparancsfájl (%s) olvasása meghiúsult"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "a várt szám helyett „%s” található"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "nem nyitható meg a típusparancsfájl (%s)"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "az időzítésfájl (%s) olvasása meghiúsult"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s időzítésfájl: %lu: várt formátum"
@@ -12952,50 +13063,47 @@ msgid "Argument error."
 msgstr "%s: Paraméterhiba, használat:\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13004,61 +13112,61 @@ msgstr ""
 "\n"
 "További információkért tekintse meg a setarch(8) kézikönyvoldalt.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "az ürítés nem kényszeríthető\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "a visszaállítás nem kényszeríthető\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "az ürítés állapota nem kérhető le\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "nem lehet átváltani az energiatakarékos módot\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "a(z) %s eszköz nem nyitható meg írásra\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl hiba: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Hiba a képernyő-kiíratás írása közben\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Nem olvasható a következő: %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: A $TERM nincs megadva.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: ismeretlen jelzés: %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13086,143 +13194,145 @@ msgstr "programindítás: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "érvénytelen kapcsoló"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "hibás időkorlátérték: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: nem nyitható meg az ideiglenes fájl.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "a felhasználóazonosító nem állítható be"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Nem lehet lekérdezni a lemez méretét"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Szórt üzenet a következőtől: %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr ""
 "%s: nem olvasható a(z) %s - a szabványos bemenet kerül felhasználásra.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s: az elérés meghiúsult"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "az olvasás meghiúsult: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "Használat: namei [-mx] útvonal [útvonal ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: nem található a terminál neve\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: az írási jogosultság ki van kapcsolva.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s nincs bejelentkezve a következőn: %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s letiltotta az üzeneteket a következőn: %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s nincs bejelentkezve\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s letiltotta az üzeneteket\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s több helyen is belépett, írás a következőre: %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "A bemeneti sor túl hosszú.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Üzenet %s@%s felhasználótól (mint %s) ezen: %s ekkor: %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Üzenet %s@%s felhasználótól ezen: %s ekkor: %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "a malloc meghiúsult"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13404,7 +13514,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13605,7 +13715,7 @@ msgstr ""
 "\n"
 "A minta nem található\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "A minta nem található"
 
@@ -13670,7 +13780,7 @@ msgstr "hexdump: hibás formátum {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: hibás átalakítási karakter: %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13698,7 +13808,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13706,81 +13816,81 @@ msgstr ""
 "%s: Használat: %s [-szám] [-p karakterlánc] [-cefnrs] [+sor] [+/minta/] "
 "[fájlok]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: a kapcsoló argumentumot igényel -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: érvénytelen kapcsoló -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...ugrás előre\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...ugrás vissza\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Nincs következő fájl"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Nincs előző fájl"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Olvasási hiba a(z) %s fájlban\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Váratlan fájl vége jel a(z) %s fájlban\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Ismeretlen hiba a(z) %s fájlban\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Nem hozható létre ideiglenes fájl\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE hiba: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(Fájl vége)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Nincs mentett keresési kifejezés"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Nem nyitható meg: "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "elmentve"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !parancs nem használható rflag módban.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "a fork() hívás meghiúsult, próbálja újra később\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Következő fájl: "
 
@@ -13850,8 +13960,8 @@ msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13867,39 +13977,149 @@ msgstr "a(z) „%s” nem nyitható meg: %s"
 msgid "no input file specified"
 msgstr "A „--date” kapcsoló nincs megadva.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "hiba a terminfo olvasásakor"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Ismeretlen escape-sorozat a bemenetben: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "A bemeneti sor túl hosszú.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Használat:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Hiba a fájl lezárásakor\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Elnézést, megváltoztathatja nem üres partíciók címkéjét.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Figyelmeztetés: %s partíció "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Figyelmeztetés: %s partíció "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "és a(z) %s átfedik egymást\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "eszköz: /dev/hda, /dev/sda vagy ezekhez hasonló eszköznév"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "bájt"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Használat:\n"
+#~ " %1$s -a [-e] [-v]                  az /etc/fstab minden "
+#~ "lapozóterületének\n"
+#~ "                                      bekapcsolása\n"
+#~ " %1$s [-p prioritás] [-v] <speciális>  adott lapozóterület bekapcsolása\n"
+#~ " %1$s -s                            lapozóterület-használat "
+#~ "összegzésének\n"
+#~ "                                      megjelenítése\n"
+#~ " %1$s -h                            súgó megjelenítése\n"
+#~ " %1$s -V                            verzió megjelenítése\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Használat:\n"
+#~ " %1$s -a [-v]                      minden lapozóterület kikapcsolása\n"
+#~ " %1$s [-v] <speciális>             adott lapozóterület kikapcsolása\n"
+#~ " %1$s -h                           súgó megjelenítése\n"
+#~ " %1$s -V                           verzió megjelenítése\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Használat: %s%s [kapcsolók] [program [program argumentumai]]\n"
+#~ "\n"
+#~ "Kapcsolók:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Használat: %s [kapcsolók] eszköz ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Használat: %s [kapcsolók] eszköz ...\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14047,29 +14267,12 @@ msgstr "A bemeneti sor túl hosszú.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [vagy --help]:      ezen súgó kiírása"
 
-#~ msgid "dangerous options:"
-#~ msgstr "Veszélyes kapcsolók:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [vagy --show-geometry]: kiírja a rendszermag elképzelését a "
 #~ "geometriáról"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -g [vagy --show-geometry]: kiírja a geometriát a partíciós tábla "
-#~ "alapján"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [vagy --show-extended]: felsorolja a kibővített partíciókat is\n"
-#~ "                                 vagy leírókat vár hozzájuk a bemenetről"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14131,62 +14334,9 @@ msgstr "A bemeneti sor túl hosszú.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [kapcsolók] [--] kapcsoló-karakterlánc paraméterek\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [kapcsolók] -o|--options kapcsoló-karakterlánc [kapcsolók] "
-#~ "[--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              paraméterek\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative                Engedélyezi a kötőjellel kezdődő "
-#~ "hosszú\n"
-#~ "                                     kapcsolókat\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                       Ez a súgószöveg\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr ""
-#~ "  -l, --longoptions=hosszú_kapcsolók    Felismerendő hosszú kapcsolók\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=programnév            A hibák ezen név alatt kerülnek "
-#~ "jelentésre\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr ""
-#~ "  -o, --options=kapcsoló-karakterlánc  Felismerendő rövid kapcsolók\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                      A hibajelentés letiltása a getopt(3)-"
-#~ "nak\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output               Nincs normál kimenet\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=parancsértelmező     A parancsértelmező idézési "
-#~ "megállapodásainak\n"
-#~ "                                     beállítása\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                       A getopt(1) verzió tesztelése\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                     Nem idézőjelezi a kimenetet\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                    Verzióinformációk kiírása\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (kibővített) 1.1.4\n"
 
diff --git a/po/id.po b/po/id.po
index 8491f5363..eb34168cf 100644
--- a/po/id.po
+++ b/po/id.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.17.1-rc1\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-02-18 04:00+0700\n"
 "Last-Translator: Arif E. Nugroho <arif_endro@yahoo.com>\n"
 "Language-Team: Indonesian <translation-team-id@lists.sourceforge.net>\n"
@@ -107,29 +107,29 @@ msgstr "membaca lagi tabel partisi"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "Dapatkan ukuran dalam 512-byte sektor"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "tidak dapat membuka %s"
@@ -211,7 +211,7 @@ msgid "Verifying ... "
 msgstr "Verifikasi ..."
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Tidak dapat membuka file '%s'"
@@ -251,15 +251,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -272,7 +272,7 @@ msgstr "%s dari %s\n"
 msgid "cannot stat file %s"
 msgstr "tidak dapat memperoleh statistik perangkat %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -321,8 +321,8 @@ msgid "stat failed: %s"
 msgstr "stat gagal: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "gagal membuka: %s"
@@ -545,55 +545,55 @@ msgstr "ofset berkas data tidak valid"
 msgid "compiled without -x support"
 msgstr "dikompile tanpa dukungan -x"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Penggunaan: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s telah di mount.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Apakah anda benar - benar ingin melanjutkan"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "membatalkan pemeriksaan.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zone nr < FIRSTZONE dalam file `%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zone nr >= ZONES dalam file `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Hapus block"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Read error: tidak dapat men-seek ke block dalam file `%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Read error: block buruk dalam file '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -602,295 +602,295 @@ msgstr ""
 "Kesalahan internal: mencoba untuk menulis bad block\n"
 "Permintaan menulis diabaikan\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "seek gagal dalam write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Write error: bad block dalam file '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "seek failed dalam write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "tidak dapat menulis super-block"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Tidak menulis peta inode"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Tidak dapat menulis peta zone"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Tidak dapat menulis inodes"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "gagal seek"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "tidak mengalokasikan penyangga untuk blok super"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "tidak dapat membaca super block"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "jumlah magic tidak baik dalam super-block"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Hanya 1k block/zones yang dilayani"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "field s_imap_blocks buruk dalam super-block"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "field s_zmap_block buruk dalam super-block"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Tidak dapat mengalokasikan buffer untuk peta inode"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Tidak dapat mengalokasikan buffer untuk peta daerah (zone map)"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Tidak dapat mengalokasikan buffer untuk inodes"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Tidak dapat mengalokasikan buffer untuk menghitung inode"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Tidak dapat mengalokasikan buffer untuk menghitung zone"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Tidak dapat membaca peta inode"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Tidak dapat membaca peta zone"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Tidak dapat membaca inodes"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Peringatan: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocks\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonesize=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxsize=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Keadaan filesystem=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "namelen=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d ditandai tidak digunakan, tetapi digunakan untuk file '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "ditandai sedang digunakan"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "File `%s' memiliki mode %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Peringatan: jumlah inode terlalu besar.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "root inode tidak berupa sebuah direktori"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Block telah digunakan sebelumnya. Sekarang dalam file `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Bersih"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Block %d dalam file `%s' di tandai tidak sedang digunakan."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Benar"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Direktori '%s' berisi jumlah inode yang buruk untuk file '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Hapus"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: direktori buruk: '.' bukan yang pertama\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: direktori buruk: '..' tidak kedua\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "kesalahan internal"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: direktori buruk: ukuran < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "gagal seek dalam bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Mode Inode %d tidak dibersihkan."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inode %d tidak digunakan, ditandai digunakan dalam bitmap."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inode %d digunakan, ditandai digunakan dalam bitmap."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Set"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (mode = %07o), i_nlinks=%d, terhitung=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Set i_nlinks ke jumlah"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr ""
 "Zone %d: ditandai sedang digunakan, tidak ada file yang menggunakannya."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Tidak ditandai"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zone %d: sedang digunakan, terhitung=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zone %d: tidak sedang digunakan, terhitung=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "ukuran inode buruk"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "ukuran inode v2 buruk"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "butuh terminal untuk interative repairs"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "tidak dapat membuka '%s': %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s bersih, tidak perlu dicheck.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Memaksa pemeriksaan filesystem di %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Filesystem di %s kotor, perlu untuk dicheck.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -899,12 +899,12 @@ msgstr ""
 "\n"
 "%6ld inodes digunakan (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones digunakan (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -926,7 +926,7 @@ msgstr ""
 "------\n"
 "%6d files\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1050,7 +1050,7 @@ msgstr "terlalu banyak inodes - maksimal adalah 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "ruang tidak cukup, butuh paling tidak %llu blok"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Perangkat: %s\n"
@@ -1223,10 +1223,8 @@ msgstr "%6.2f%% (%+ld bytes)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Error dalam menutup file\n"
+msgid "cannot close file %s"
+msgstr "Tidak dapat membuka file '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1340,88 +1338,98 @@ msgstr ""
 "PERINGATAN: nomor perangkat dipotong menjadi %u bits. Ini mungkin berarti\n"
 "beberapa device files mungkin salah.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Penggunaan: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s ter-mount; tidak akan membuat filesystem here!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "seek untuk boot block gagal dalam write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "tidak dapat membersihkan boot sector"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "seek gagal dalam write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "tidak dapat menulis super-block"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "tidak dapat menulis inode map"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "tidak dapat menulis zone map"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "tidak dapat menulis inodes"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "seek gagal dalam write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "gagal menulis dalam write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "terlalu banyak bad blocks"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "tidak cukup good blocks"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "tidak mengalokasikan penyangga untuk blok super"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "tidak mengalokasikan buffer untuk maps"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "tidak dapat mengalokasikan buffer untuk inodes"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodes\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blocks\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1430,97 +1438,97 @@ msgstr ""
 "Ukuran Maksimal=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "seek gagal selama pengetesan blocks"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nilai aneh dalam do_check: mungkin bugs\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "seek gagal dalam check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "bad blocks sebelum daerah data: tidak dapat membuak fs"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d bad blocks\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "satu bad block\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "tidak dapat membuka file dari bad blocks"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "badblock nomor masukan error di baris %d\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "Tidak dapat membaca berkas blok buruk"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "ukuran inode buruk"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol error: jumlah dari block tidak dispesifikasikan"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat gagal"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: gagal membuka"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: perangkat sedang sibuk"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "ukuran blok lebih kecil dari ukuran sektor fisik dari %s"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "tidak dapat menentukan ukuran dari %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "tidak akan mencoba untuk membuat filesystem pada '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Jumlah dari blok terlalu kecil"
@@ -1855,7 +1863,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "seek gagal dalam write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2206,7 +2214,7 @@ msgid "   Logical"
 msgstr "   Logical"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
@@ -2875,12 +2883,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Perintah BSD disklabel (m untuk bantuan): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Pertama %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Terakhir %s atau +size atau +sizeM atau +sizeK"
@@ -3026,7 +3034,7 @@ msgid "tracks/cylinder"
 msgstr "tracks/cylinder"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cylinders"
 
@@ -3093,12 +3101,12 @@ msgstr "Maksimum jumlah partisi telah dibuat\n"
 msgid "This partition already exists.\n"
 msgstr "Partisi ini sudah ada.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Peringatan: terlalu banyak partisi (%d, maksimum adalah %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3316,7 +3324,7 @@ msgstr "Anda harus menset"
 msgid "heads"
 msgstr "heads"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektor"
 
@@ -3765,7 +3773,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot      Awal          Akhir    Blocks   Id  System\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Perangkat"
 
@@ -3849,7 +3857,7 @@ msgstr "Total sektor teralokasi %llu lebih besar dari pada maksimal %llu\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "Sisa %lld sektor tidak dialokasikan %d-byte sektor\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Partisi %d sudah didefinisikan. Hapus ini sebelum menambahkannya.\n"
@@ -4005,37 +4013,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Sinkronisasi disks.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partisi %d tidak memiliki area data\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Awal baru dari data"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Perintah expert (m untuk bantuan): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Jumlah dari cylinders"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Jumlah dari heads"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Jumlah dari sektor"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Peringatan: setting sektor offset untuk DOS kompatibilitas\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4047,32 +4055,32 @@ msgstr ""
 "PERINGATAN: GPT (GUID Tabel Partisi) terdeteksi di '%s'! aplikasi fdisk "
 "tidak mendukung GPT. Gunakan GNU Parted.\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s tidak memiliki sebuah tabel partisi yang valid\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Tidak dapat membuka %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "tidak dapat membuka %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: perintah tidak diketahui\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Kernel ini mencari ukuran sektornya sendiri - pilihan -b diabaikan\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4081,16 +4089,16 @@ msgstr ""
 "Peringatan: pilihan -b (set ukuran sektor) seharusnya digunakan dengan salah "
 "satuperangkat yang digunakan\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Terdeteksi sebuah OSF/1 disklabel di %s, memasuki mode disklabel.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Perintah (m untuk bantuan): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4099,16 +4107,16 @@ msgstr ""
 "\n"
 "Boot file yang saat ini digunakan: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Tolong masukkan nama dari boot file yang baru: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot file tidak diubah\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4425,10 +4433,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tAnda telah memilih sebuah nama file boot yang tidak biasa.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
-"Maaf Anda mungkin telah merubah Tag dari sebuah partisi yang tidak kosong.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Maaf, hanya superuser yang dapat mengubah System Clock.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4444,7 +4451,7 @@ msgstr ""
 "di bagian keseluruhan disk akan mengganggu ini. Ketik YES jika anda yakin\n"
 "mengenai tagging partisi ini secara berbeda.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "YA\n"
 
@@ -4645,7 +4652,7 @@ msgstr "Gap yang tidak digunakan - sektor 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Gap yang tidak digunakan sektor %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4654,7 +4661,7 @@ msgstr ""
 "Partisi lain sudah melingkupi seluruh disk.\n"
 "Hapus sebagian/kecilkan mereka sebelum mencoba lagi.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4663,12 +4670,12 @@ msgstr ""
 "Ini sangat direkomendasikan partisi ketika melingkupi seluruh disk\n"
 "dan memiliki tipe `Whole disk'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d sudah dialokasikan\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4680,7 +4687,7 @@ msgstr ""
 "%d %s melingkupi beberapa partisi yang lain. Masukan anda telah berubah \n"
 "menjadi %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4690,7 +4697,7 @@ msgstr ""
 "untuk meninggalkan partisi ini sebagai Whole disk (5), mulai di 0, dengan %u "
 "sectors\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4704,7 +4711,7 @@ msgstr ""
 "yakin, akankah anda menset (tag) partisi tersebut dengan tipe 82 (Linux "
 "swap): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4725,7 +4732,7 @@ msgstr ""
 "Satuan = %s dari %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4738,28 +4745,28 @@ msgstr ""
 "Units = %s of %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Tanda   Awal        Akhir  Blocks   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Jumlah dari cylinder alternative"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektor per cylinder"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Faktor Interleave"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Kecepatan rotasi (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Jumlah dari physical cylinders"
 
@@ -5218,7 +5225,7 @@ msgstr "Disk %s: tidak dapat memperoleh geometri\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: tidak dapat memperoleh ukuran\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5229,24 +5236,24 @@ msgstr ""
 "seluruh disk. Menggunakan fdisk untuk ini mungkin tidak berarti.\n"
 "[Gunakan pilihan --force jika anda benar - benar menginginkan hal ini]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Peringatan: HDIO_GETGEO mengatakan bahwa disana ada %lu heads\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Peringatan: HDIO_GETGEO mengatakan bahwa disana ada %lu sektor\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "Peringatan: BLKGETSIZE/HDIO_GETGEO mengatakan bahwa disana ada %lu "
 "cylinders\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5256,7 +5263,7 @@ msgstr ""
 "Ini akan memberikan masalah dengan seluruh software yang pengalamatan "
 "mengunakan C/H/S.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5265,7 +5272,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5273,7 +5280,7 @@ msgstr ""
 "%s dari partisi %s memiliki jumlah head yang tidak mungkin: %lu (seharusnya "
 "berada dalam 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5282,7 +5289,7 @@ msgstr ""
 "%s dari partisi %s memiliki jumlah sektor yang tidak mungkin: %lu "
 "(seharusnya berada dalam 1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5291,7 +5298,7 @@ msgstr ""
 "%s dari partisi %s memiliki jumlah cylinders yang tidak mungkin: %lu "
 "(seharusnya berada dalam 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5300,12 +5307,12 @@ msgstr ""
 "Nama Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Membaca kembali tabel partisi ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5315,26 +5322,26 @@ msgstr ""
 "Jalankan partprobe(8), kpartx(8) atau reboot sistem anda sekarang,\n"
 "sebelum menggunakan mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Error menutup %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: tidak ada partisi seperti itu\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "format tidak dikenali - menggunakan sektor\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format tidak diimplementasikan - menggunakan %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5343,12 +5350,12 @@ msgstr ""
 "Satuan = cylinders dari %lu bytes, block dari 1024 bytes, dihitung dari %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Device Boot Awal      Akhir #cyls    #blocks   Id  System\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5357,12 +5364,12 @@ msgstr ""
 "Satuan = sektor dari 512 bytes, dihitung dari %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Device Boot    Awal        Akhir #sectors  Id  System\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5371,12 +5378,12 @@ msgstr ""
 "Satuan = blocks dari 1024 bytes, dihitung dari %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Device Boot   Awal        Akhir  #blocks   Id  System\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5386,32 +5393,32 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Device Boot Awal    Akhir  MiB    #blocks   Id  System\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tawal: (c,h,s) diperkirakan (%ld,%ld,%ld) ditemukan (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\takhir: (c,h,s) diperkirakan (%ld,%ld,%ld) ditemukan (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partisi tidak berakhir di cylinder %ld, diluar dari akhir dari disk\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Tidak ada partisi yang ditemukan\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5422,52 +5429,42 @@ msgstr ""
 "C/H/S=*/%ld/%ld (daripada untuk %ld/%ld/%ld).\n"
 "Untuk daftar ini Saya akan berasumsi dengan menggunakan geomtri tersebut.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "tidak ada tabel partisi yang ada.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "aneh, hanya %d partisi yang didefinisikan.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Peringatan: partisi %s memiliki ukuran 0 tetapi tidak ditandai Kosong\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Peringatan: partisi %s memiliki ukuran 0 dan bootable\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Peringatan: partisi %s memiliki ukuran 0 dan awal yang tidak kosong\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Peringatan: partisi %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "tidak berada di partisi %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Peringatan: partisi %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "dan %s overlap\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Peringatan: partisi %d kosong\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5476,17 +5473,17 @@ msgstr ""
 "Peringatan: partisi %s berisi bagian dari tabel partisi (sektor %lu),\n"
 "dan akan menghancurkannya ketika terisi.\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Peringatan: partisi %s berawal di sektor 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Peringatan: partisi %s meluas melewati akhir dari disk\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5494,17 +5491,17 @@ msgstr ""
 "Diantara partisi primary, paling tidak satu dapat menjadi extended\n"
 "(walaupun ini bukan menjadi masalah dalam Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Peringatan: partisi %s tidak berawal dalam batas cylinder\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Peringatan: partisi %s tidak berakhir dalam batas cylinder\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5513,7 +5510,7 @@ msgstr ""
 "Ini tidak menjadi masalah untuk LILO, tetapi DOS MBR tidak akan mem-boot "
 "disk ini.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5521,7 +5518,7 @@ msgstr ""
 "Peringatan: biasanya hanya satu yang dapat di boot dari partisi primary\n"
 "LILO mengabaikan tanda `bootable'.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5530,11 +5527,11 @@ msgstr ""
 "Ini tidak menjadi masalah untuk LILO, tetapi DOS MBR tidak akan dapat mem-"
 "boot disk ini.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "awal"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5542,23 +5539,23 @@ msgstr ""
 "partisi %s: awal: (c,h,s) diperkirakan (%ld,%ld,%ld) ditemukan (%ld,%ld,"
 "%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "akhir"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partisi %s: akhir: (c,h,s) diperkirakan (%ld,%ld,%ld) ditemukan (%ld,%ld,"
 "%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partisi %s berakhir di cylinder %ld, diluar dari akhir dari disk\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5567,7 +5564,7 @@ msgstr ""
 "Peringatan: awal tergeser dari extd partisi dari %ld menjadi %ld\n"
 "(Hanya untuk tujuan pendaftaran. Jangan mengubah isinya.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5575,133 +5572,133 @@ msgstr ""
 "Peringatan: partisi extended tidak berawal di batas cylinder.\n"
 "DOS dan Linux akan menginterpretasikan isi secara berbeda.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "terlalu banyak partisi - mengabaikan partisi yang melewati nr (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "tree dari partisi?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "terdeteksi Disk Manager - tidak dapat menangani ini\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 signature ditemukan - menyerah\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "aneh..., sebuah extended partisi yang berukuran 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "aneh..., sebuah BSD partisi yang berukuran 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: tipe tabel partisi tidak diketahui\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "pilihan -n telah diberikan: Tidak ada yang berubah\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Gagal menyimpan sektor lama - membatalkan\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Gagal menulis partisi di %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "panjang atau baris input tidak complete - berhenti\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "input error: `=' diperkirakan setelah %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "input error: unexpected character %c setelah %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input tidak diketahui: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "nomor terlalu besar\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "trailing junk sesudah nomor\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "tidak ada ruang untuk partisi deskripsi\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "tidak dapat membuat extended partisi disekitarnya\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "terlalu banya input\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Tidak ada ruang lagi\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Tipe ilegal\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Peringatan: diberikan ukuran (%lu) melebihi ukuran maksimal yang diijinkan "
 "(%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Peringatan: partisi kosong\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Peringatan: partisi memiliki awal yang buruk (terlalu awal %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "tanda bootable tidak diketahui - pilih - atau *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "partial c,h,s spesifikasi?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Extended partisi tidak diperkirakan\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "input tidak baik\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "terlalu banyak partisi\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5713,100 +5710,183 @@ msgstr ""
 "<c,h,s> biasanya anda hanya perlu untuk menspesikan <awal> dan <ukuran> (dan "
 "mungkin <tipe>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
+msgstr "Penggunaan:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "perangkat: sesuatu seperti /dev/hda atau /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Pilihan:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "pilihan yang berbahaya:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [atau --show-pt-geometry]: tampilkan geometry yang ditebak dari tabel "
+"partisi"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [atau --show-extended]: juga menampilkan partisi extended dalam "
+"output\n"
+"                               atau memperkirakan deskripsi dari partisi di "
+"input"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Penggunaan:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s perangkat\t\t daftar dari partisi aktif di perangkat\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s perangkat n1 n2 ... aktivasi partisi n1 ..., menonaktifkan sisanya\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An perangkat\t aktivasi partisi n, menonaktifkan yang lainnya\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5819,64 +5899,64 @@ msgstr ""
 "tidak mendukung GPT. Gunakan GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Gunakan pilihan --force untuk memaksa pemeriksaan ini.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "tidak ada perintah?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "jumlah: %llu blocks\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "penggunaan: sfdisk --print-id perangkat nomor-partisi\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "penggunaan: sfdisk --change-id perangkat nomor-partisi Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "penggunaan: sfdisk --id perangkat nomor-partisi [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "tidak dapat menspesifikasikan hanya untuk satu perangkat (kecuali dengan "
 "pilihan -l atau -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "tidak dapat membuka %s untuk baca-tulis\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "tidak dapat membuka %s untuk membaca\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Tidak dapat memperoleh ukuran dari %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "active byte tidak baik: 0x%x daripada 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5884,7 +5964,7 @@ msgstr ""
 "Selesai\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5894,35 +5974,35 @@ msgstr ""
 "LILO,\n"
 "tetapi DOS MBR hanya akan memboot sebuah disk dengan 1 active partisi.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partisi %s memiliki id %x dan ini tidak disembunyikan\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Bad Id %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Disk ini saat ini sedang digunakan.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatal error: tidak dapat menemukan %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Peringatan: %s bukan sebuah perangkat block\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Mengecheck apakah ada yang sedang menggunakan disk saat ini ...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5934,31 +6014,31 @@ msgstr ""
 "Buruk. Umount seluruh filesystem, dan swapoff seluruh partisi swap di disk \n"
 "ini. Gunakan pilihan --no-reread untuk menekan pengechekan ini.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 "Gunakan pilihan --force untuk memaksa pemeriksaan secara keseluruhan.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Keadaan lama:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partisi %d tidak ada, tidak dapat mengubahnya\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Keadaan baru:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5966,21 +6046,21 @@ msgstr ""
 "Saya tidak suka partisi ini -- tidah ada yang diubah.\n"
 "(Jika anda benar - benar menginginkan ini, gunakan pilihan --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Saya tidak menyukai ini - mungkin anda seharusnya menjawab No\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Apakan anda puas dengan keadaan ini? [ynq]"
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Anda ingin menulis ini ke disk? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5989,16 +6069,16 @@ msgstr ""
 "\n"
 "sfdisk: premature diakhir dari masukan\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Selesai - tidak ada yang diubah\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Tolong jawan salah satu dari y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6007,7 +6087,7 @@ msgstr ""
 "Sukses menulis tabel partisi baru\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6038,26 +6118,28 @@ msgstr "Sinkronisasi disks.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s sukses.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s gagal.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "PERINGATAN: tidak dapat membuka %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "PERINGATAN: format buruk di baris %d dari %s\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -6069,37 +6151,37 @@ msgstr ""
 "\tseharusnya membetulkan berkas /etc/fstab anda secepatnya.\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: tidak ditemukan\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s: tunggu: Tida ada proses anak lagi?!?\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "Peringatan... %s untuk perangkat %s keluar dengan sinyal %d.\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s %s: status adalah %x, seharusnya tidak pernah terjadi.\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Selesai dengan %s (status keluar %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: Error %d ketika menjalankan fsck.%s untuk %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6108,7 +6190,7 @@ msgstr ""
 "Baik seluruh atau kosong dari tipe sistem berkas dilewatkan ke -t harus\n"
 "diawali dengan 'no' atau '!'.\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
@@ -6116,33 +6198,33 @@ msgstr ""
 "%s: melewatkan baris buruk dalam /etc/fstab: jalankan mount dengan tahap "
 "bukan nol di fsck\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: melewatkan perangkat yang tidak ada\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck: tidak dapat memeriksa %s: fsck.%s tidak ditemukan\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "Memeriksa seluruh sistem berkas.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--menunggu-- (tahap %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6150,58 +6232,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: terlalu banyak perangkat\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Tidak dapat membuka %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "Apakah /proc telah terpasang?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Harus root untuk dapat memindai untuk mencocokan sistem berkas: %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Tidak dapat menemukan sistem berkas yang cocok: %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: terlalu banyak argumen\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6220,33 +6302,79 @@ msgstr "long pilihan kosong setelah pilihan -l atau --long argumen"
 msgid "unknown shell after -s or --shell argument"
 msgstr "tidak diketahui shell setelah pilihan -s atau --shell argumen"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [pilihan] -o | --options optstring [pilihan] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Membolehkan pilihan panjang dimulai dengan "
+"sebuah -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Ini sedikit petunjuk penggunaan\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=longopts   Pilihan panjang yang dikenal\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=progname          Nama dimana error tersebut dilaporkan\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=optstring      Pilihan pendek yang dikenal\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
 msgstr ""
+"  -q, --quiet                  Mematikan laporan error oleh getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Tidak ada output normal\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=shell            Mengeset shell quoting conventions\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Test untuk versi getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 Jangan quote output\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Tampilkan informasi versi\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "hilang argument optstring"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "kerusakan internal, hubungi author."
 
@@ -6713,70 +6841,88 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Tidak dapat menset nilai epoch dalam kernel.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Pilihan:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -A|--srm, -F|--funky-toy\n"
@@ -6784,22 +6930,22 @@ msgstr ""
 "(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Tidak dapat menghubungi ke sistem audit\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "gagal mendapatkan pid"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s tidak membutuhkan argument. Anda memberikan %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6808,7 +6954,7 @@ msgstr ""
 "Anda telah menspesifikasi beberapa fungsi.\n"
 "Anda hanya dapat melakukan satu fungsi dalam satu waktu.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6817,7 +6963,7 @@ msgstr ""
 "%s: Pilihan --utc dan --localtime adalah mutually eksklusive. Anda "
 "menspesifikasikan keduanya.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6826,7 +6972,7 @@ msgstr ""
 "%s: Pilihan --adjust dan --noadjfile adalah mutually eksklusive. Anda "
 "menspesifikasikan keduanya.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6835,29 +6981,29 @@ msgstr ""
 "%s: Pilihan --adjfile dan --noadjfile adalah mutually eksklusive. Anda "
 "menspesifikasikan keduanya.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: Dengan --noadjfile, anda harus menspesifikasi baik --utc atau --"
 "localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Tidak ada set-to time yang berguna. Tidak dapat menset clock.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Maaf, hanya superuser yang dapat mengubah Hardware Clock.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Maaf, hanya superuser yang dapat mengubah System Clock.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6865,13 +7011,13 @@ msgstr ""
 "Maaf, hanya superuser yang dapat mengubah Hardware Clock epoch di dalam "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "Tidak dapat mengakses Hardware Clock melalui semua metode yang diketahui.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7052,7 +7198,7 @@ msgid "failed to read mtab"
 msgstr "gagal untuk mendapatkan statistik: %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "gagal menginisialisasi baris penyangga\n"
@@ -7094,45 +7240,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7142,27 +7328,27 @@ msgstr ""
 "Untuk informasi lebih lanjut lihat ipcmk(1).\n"
 "\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: mount gagal"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "gagal mendapatkan pid"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "gagal mendapatkan atribut pid %d"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "gagal mengalokasikan outbuffer"
@@ -7249,7 +7435,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: PAM Gagal, membatalkan: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Password: "
 
@@ -7696,47 +7882,48 @@ msgstr "TERLALU BANYAK linefeeds"
 msgid "too many bare linefeeds."
 msgstr "terlalu banyak linefeeds bare.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Waktu habis untuk Login sesudah %d detik\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Login terakhir: %.*s"
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "dari %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "di %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "gagal menulis ke stdout"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LOGIN GAGAL DARI %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LOGIN GAGAL DI %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LOGIN GAGAL DARI %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LOGIN GAGAL DI %s, %s"
@@ -7766,7 +7953,7 @@ msgstr "mount: ijin ditolak"
 msgid "setuid failed"
 msgstr "setuid() gagal"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "gagal menjalankan %s"
@@ -7813,8 +8000,8 @@ msgstr ""
 "%s: tidak dapat membuka %s: %s (perubahan yang anda lakukan masih berada "
 "dalam %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "gagal fork"
 
@@ -7866,24 +8053,21 @@ msgstr "nilai tahun ilegal: gunakan 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "penggunaan: cal [-13smjyV] [[[hari] bulan] tahun]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7995,32 +8179,32 @@ msgstr " Hapus"
 msgid "failed to add line to output"
 msgstr "gagal mengalokasikan outbuffer"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "error mengambil\n"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "gagal menginisialisasi baris penyangga\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: tidak dapat membaca %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "gagal menginisialisasi baris penyangga\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc() gagal"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8031,49 +8215,74 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Perintah yang tersedia:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8082,43 +8291,43 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat namei(1).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 #, fuzzy
 msgid "options are mutually exclusive"
 msgstr "--offset dan --all adalah 'mutually exclusive'"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Bukan direktori %s!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "gagal mendapatkan pid"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "gagal menginisialisasi baris penyangga\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "gagal menginisialisasi baris penyangga\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "gagal menginisialisasi baris penyangga\n"
@@ -8143,12 +8352,12 @@ msgstr "%s: tidak dapat menemukan process \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: signal tidak diketahui %s; valid signals:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "penggunaan: %s [ -s signal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signal ]\n"
@@ -8168,85 +8377,84 @@ msgstr "socket: %s.\n"
 msgid "connect %s"
 msgstr "terhubung: %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "soket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "terhubung"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Penggunaan: %s [pilihan]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(File selanjutnya: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "gagal mendapatkan prioritas"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Nilai diluar dari jangkauan.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: nama fasilitas tidak diketahui: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: nama priority tidak diketahui: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8386,7 +8594,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: gagal untuk berpindah ke ofset 0x%jx"
 
 #: misc-utils/lsblk.c:809
@@ -8404,12 +8612,13 @@ msgstr "%s: gagal untuk membuka: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "gagal mendapatkan pid"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8417,7 +8626,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8440,7 +8649,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8450,33 +8659,33 @@ msgstr ""
 "Untuk informasi lebih lanjut lihat wipefs(8).\n"
 "\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Penggunaan: %s [pilihan]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Tidak dapat membuka %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Memperoleh %d bytes dari %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "gagal menjalankan %s"
@@ -8496,26 +8705,15 @@ msgstr "tidak dapat memperoleh statistik '%s'"
 msgid "%s - No such file or directory\n"
 msgstr "%s: membutuhkan berkas deskripsi, berkas atau direktori\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Penggunaan: %s [pilihan] pathname [pathname ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Pilihan:\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8534,8 +8732,7 @@ msgstr ""
 " -n, --nosymlinks    jangan ikuti symlinks\n"
 " -v, --vertical      sesuaikan vertikal dari mode dan pemilik\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8543,12 +8740,12 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat namei(1).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "argumen --date terlalu panjang\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s: melewati batas dari symlinks"
@@ -8558,166 +8755,164 @@ msgstr "%s: melewati batas dari symlinks"
 msgid "renaming %s to %s failed"
 msgstr "%s: mengubah nama %s ke %s gagal: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "argumen tidak baik"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "tulis"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "jumlah yang terbaca"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "panjang balasan buruk"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "gagal mendapatkan pid"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "gagal untuk mendapatkan statistik: %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "daemon uuidd telah berjalan dengan pid %s\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "Tidak dapat membuat aliran soket unix: %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Tidak dapat mengikat soket unix %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Tidak dapat mendengarkan di soket unix %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Error membaca dari klien, panjang = %d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "operasi %d, masukan jumlah = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "Operasi %d tidak valid\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "UUID waktu yang dihasilkan: %s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "UUID acak yang dihasilkan: %s\n"
 
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "UUID waktu yang dihasilkan %s dan %d yang mengikutinya\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "UUID waktu yang dihasilkan %s dan %d yang mengikutinya\n"
+msgstr[1] "UUID waktu yang dihasilkan %s dan %d yang mengikutinya\n"
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, fuzzy, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "Menghasilkan %d UUID:\n"
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "Menghasilkan %d UUID:\n"
+msgstr[1] "Menghasilkan %d UUID:\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "Operasi %d tidak valid\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "Panjang balasan dari server tidak terduga %d\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "Angka buruk: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Error memanggil daemon uuidd (%s): %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, fuzzy, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s dan UUID %d selanjutnya\n"
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s dan UUID %d selanjutnya\n"
+msgstr[1] "%s dan UUID %d selanjutnya\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, fuzzy, c-format
 msgid "List of UUIDs:\n"
 msgstr "Daftar dari UUID:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "Tidak dapat mematikan uuidd yang berjalan dengan pid %d: %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "Dimatikan uuidd yang berjalan dengan pid %d\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8725,29 +8920,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8780,29 +8974,31 @@ msgid "%s: write failed"
 msgstr "%s: gagal menulis"
 
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd bytes ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] dihapus di ofset 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "nilai ofset yang dispesifikasikan tidak valid"
 
-#: misc-utils/wipefs.c:306
+#: misc-utils/wipefs.c:305
 #, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
+
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 " -a, --all           hapus seluruh 'magic strings' (HATI-HATI)\n"
 " -h, --help          pesan bantuan ini\n"
@@ -8812,7 +9008,7 @@ msgstr ""
 " -p, --parsable      tampilkan dalam format yang mudah diparse daripada "
 "format cetak\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8822,11 +9018,11 @@ msgstr ""
 "Untuk informasi lebih lanjut lihat wipefs(8).\n"
 "\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "--offset dan --all adalah 'mutually exclusive'"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8924,63 +9120,63 @@ msgstr "error mengubah kepemilikan dari %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "tidak dapat mengganti nama %s menjadi %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev direktori tidak ada."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: tidak dapat menset kapasitas di perangkat %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", sizelimit %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", enkripsi %s (tipe %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", offset %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", encryption type %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: tidak dapat memperoleh info di perangkat %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: tidak dapat membuka perangkat %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: tidak ada ijin untuk melihat di /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: tidak dapat menemukan perangkat loop yang tidak dipakai"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8990,56 +9186,54 @@ msgstr ""
 "mengetahui\n"
 "    mengenai perangkat loop? (Jika demikian, recompile atau `modprobe loop'.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Kehabisan memori ketika membaca kata sandi"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "peringatan: %s sudah diasosiasikan dengan %s\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "peringatan: %s: memiliki proteksi untuk ditulis, menggunakan baca-saja.\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Tidak dapat mengunci ke memory, keluar.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD gagal: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu, %llu): berhasil\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): berhasil\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: tidak dapat menghapus perangkat %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Mount ini telah dikompile tanpa layanan loop. Tolong di rekompile.\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9047,7 +9241,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Penggunaan:\n"
@@ -9059,19 +9253,17 @@ msgstr ""
 "associated <berkas> [-o <num>]   daftar seluruh asosiasi dengan <berkas>\n"
 " %1$s [ pilihan ] {-f|--find|loopdev} <berkas> konfigurasi\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9087,32 +9279,32 @@ msgstr ""
 " -v | --verbose           mode verbose\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "nilai ofset '%s' tidak valid"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "nilai ofset '%s' tidak valid"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Perangkat loop adalah %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "tercuri loop=%s ...mencoba lagi\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: perangkat sedang sibuk"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Layanan loop tidak ada pada waktu dikompile. Tolong di rekompile.\n"
@@ -9705,14 +9897,17 @@ msgstr "kutu/bug dalam pemanggilan xstrndup"
 msgid "not enough memory"
 msgstr "memory tidak cukup"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "Parameter <spesial>:\n"
@@ -9722,131 +9917,116 @@ msgstr ""
 " <berkas>                             nama dari berkas yang digunakan\n"
 "\n"
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Penggunaan:\n"
-" %1$s -a [-e] [-v] [-f]             mengaktifkan seluruh swap dari /etc/"
-"fstab\n"
-" %1$s [-p prioritas] [-v] [-f] <spesial> mengaktifkan swap yang diberikan\n"
-" %1$s -s                            menampilkan ringkasan pengunaan swap\n"
-" %1$s -h                            menampilkan bantuan\n"
-" %1$s -V                            menampilkan versi\n"
-"\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Penggunaan:\n"
-" %1$s -a [-v]                      menonaktifkan seluruh swaps\n"
-" %1$s [-v] <spesial>               menonaktifkan swap yang diberikan\n"
-" %1$s -h                           menampilkan bantuan\n"
-" %1$s -V                           menampilkan versi\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: format berkas tidak terduga"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: Menginisialisasi ulang swap."
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "gagal eksekusi"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "waitpid gagal"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek gagal"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: gagal menulis tanda tangan"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 "%s: ditemukan tanda partisi swap: versi %d, ukuran-halaman %d, susunan byte "
 "%s"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "berbeda"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "sama"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: mode tidak aman %04o, disarankan menggunakan mode %04o."
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: mode tidak aman %04o, disarankan menggunakan mode %04o."
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: dilewatkan  - kelihatannya memiliki lubang."
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: gagal mendapatkan ukuran"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: pembacaan header swap gagal"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr "%s: last_page 0x%08llx berukuran lebih besar dari swapspace sebenarnya"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: format swap pagesize tidak cocok."
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9854,36 +10034,36 @@ msgstr ""
 "%s: format swap pagesize tidak cocok. (Gunakan --fixpgsz untuk "
 "menginisialisasi ulang.)"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr "%s: aplikasi suspend data terdeteksi. Menulis ulang tanda swap."
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s di %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon gagal"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "tidak dapat menemukan perangkat %s"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "Bukan superuser."
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: gagal swapoff"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10163,7 +10343,7 @@ msgstr "Partisi yang terpilih %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10223,19 +10403,13 @@ msgstr "        (%s tabel partisi terdeteksi). "
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Disk %s tidak memiliki sebuah tabel partisi yang valid\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10246,21 +10420,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Perintah yang tersedia:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10269,27 +10442,27 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat namei(1).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "--offset dan --all adalah 'mutually exclusive'"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "gagal mendapatkan pid"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "--offset dan --all adalah 'mutually exclusive'"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "gagal menginisialisasi baris penyangga\n"
@@ -10416,7 +10589,7 @@ msgstr "gagal menset kebijakan pid %d"
 msgid "failed to set pid %d's policy"
 msgstr "gagal menset kebijakan pid %d"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "gagal menjalankan %s"
@@ -10687,7 +10860,7 @@ msgstr "%s: %ld nilai default threshold dan %ld nilai default timeout\n"
 msgid "Can't set signal handler"
 msgstr "Tidak dapat menset pengolah sinyal"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday gagal"
 
@@ -10696,26 +10869,26 @@ msgstr "gettimeofday gagal"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Tidak dapat mengisukan CYGETMON di %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f int/sec; %f rec, %f send (char/sec)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (char/sec)\n"
@@ -10807,130 +10980,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "tidak dapat daemonize"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Penggunaan: %s [pilihan]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "gagal mendapatkan pid"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Perintah tidak diketahui: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "gagal mendapatkan pid"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Bukan direktori %s!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync gagal"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "gagal menulis: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "gagal mendapatkan pid"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "tidak ada perintah?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctl gagal"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Penggunaan: %s [pilihan] <nama berkas>\n"
-"\n"
-"Pilihan:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10942,7 +11092,7 @@ msgstr ""
 " -o, --offset <num>  ofset dari alokasi, dalam bytes\n"
 " -l, --length <num>  panjang dari alokasi, dalam bytes\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -10951,32 +11101,32 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat fallocate(1).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "panjang argumen tidak dispesifikasikan"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "nilai panjang yang dispesifikasikan tidak valid"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "nilai ofset yang dispesifikasikan tidak valid"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "nama berkas tidak dispesifikasikan."
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "diduga sebuah nomor, tetapi diperoleh '%s'"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "mode jaga ukuran (-n pilihan) tidak didukung"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate gagal"
@@ -10984,18 +11134,24 @@ msgstr "%s: fallocate gagal"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "Penggunaan: %1$s [-sxun][-w #] fd#\n"
 "            %1$s [-sxon][-w #] berkas [-c] perintah...\n"
@@ -11010,52 +11166,48 @@ msgstr ""
 "  -h  --help       Tampilkan teks ini\n"
 "  -V  --version    Tampilkan versi\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s: %s membutuhkan tepat sebuah argument perintah\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: tidak dapat membuka berkas kunci%s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: angka buruk: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s: membutuhkan berkas deskripsi, berkas atau direktori\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: gagal fork: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Penggunaan: %s [pilihan] <nama berkas>\n"
 "\n"
 "Pilihan:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11064,38 +11216,37 @@ msgstr ""
 "Untuk informasi lebih lanjut lihat wipefs(8).\n"
 "\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "nama berkas tidak dispesifikasikan."
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "nama berkas tidak dispesifikasikan."
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s: stat gagal"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "akar inode bukan sebuah direktori"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "%s: gagal menulis"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s: gagal menulis"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11104,8 +11255,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11113,99 +11264,88 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat namei(1).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "gagal mendapatkan pid"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "gagal mendapatkan pid"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "gagal membaca berkas pewaktu %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "nama berkas tidak dispesifikasikan."
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "akar inode bukan sebuah direktori"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: gagal menulis"
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:84
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
-"\n"
-"Penggunaan: %s [pilihan]\n"
-"\n"
 
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <besar>    buat bagian memori terbagi dalam ukuran <besar>\n"
 "  -S <nsems>    buat rangkaian semaphor dengan <nsems> elemen\n"
 "  -Q            buat antrian pesan\n"
 "  -p <mode>     ijin untuk sumber daya (baku adalah 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat ipcmk(1).\n"
 "\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "pembuatan memori terbagi gagal"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "Identitas memori terbagi: %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "pembuatan atrian pesan gagal"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "Identitas antrian pesan: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "pembuatan semaphor gagal"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "Identitas semaphor: %d\n"
@@ -11698,8 +11838,8 @@ msgstr ""
 "Bagian memory share shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11708,8 +11848,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11741,8 +11881,8 @@ msgstr ""
 "Antrian Pesan msgid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11774,8 +11914,8 @@ msgstr ""
 "Semaphore Array semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11823,16 +11963,14 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "id tidak valid: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Penggunaan: %s [ -dhV78neo12 ] [ -s <kecepatan> ] <ldisc> <perangkat>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11840,7 +11978,7 @@ msgstr ""
 "\n"
 "Nama <ldisc> dikenal:\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 #, fuzzy
 msgid ""
 "\n"
@@ -11849,50 +11987,50 @@ msgstr ""
 "\n"
 "Nama <ldisc> dikenal:\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "kecepatan tidak valid: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach dari %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "pilihan tidak valid"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "baris disiplin tidak valid: %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s bukan sebuah baris serial"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "tidak dapat memperoleh atribut terminal %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "kecepatan %d tidak didukung"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "tidak dapat menset atribut terminal untuk %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "Tidak dapat menset baris disiplin"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "tidak dapat daemonize"
 
@@ -12049,15 +12187,14 @@ msgstr "%s persediaan:"
 msgid "NUMA node%d CPU(s):"
 msgstr "Titik NUMA:"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "Informasi pembantu arsitektur CPU\n"
 "\n"
@@ -12066,26 +12203,22 @@ msgstr ""
 "tercetak.\n"
 "  -s, --sysroot   gunakan direktori sebagai sistem root baru.\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12095,12 +12228,12 @@ msgstr ""
 "Untuk informasi lebih lanjut lihat ipcmk(1).\n"
 "\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "akar inode bukan sebuah direktori"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s telah di mount.\t "
@@ -12136,47 +12269,45 @@ msgstr ""
 "\t -n            disable byte order auto-detection\n"
 "\t -V            tampilkan versi dan keluar\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: error dalam menulis %s: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Mengasumsikan urutan byte terbalik. Gunakan -n untuk memaksa urutan byte "
 "asal.\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): salah baris map\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: tidak dapat mencari \"_stext\" dalam %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profile alamat diluar jangkauan. Salah file map?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12191,10 +12322,7 @@ msgstr ""
 "\n"
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12203,8 +12331,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12212,72 +12340,61 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat unshare(1).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice dari %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Perintah tidak diketahui: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "nilai waktu timeout buruk: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "pengguna"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Gagal menset personality ke %s"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Gagal menset personality ke %s"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: prioritas sebelumnya %d, prioritas baru %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Penggunaan: %s [pilihan] <nama berkas>\n"
-"\n"
-"Pilihan:\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "penggunaan: %s [pilihan]\n"
 "    -d | --device <perangkat> pilih perangkat rtc (rtc0|rtc1|...)\n"
@@ -12289,8 +12406,8 @@ msgstr ""
 "    -v | --verbose            pesan verbose\n"
 "    -V | --version            tampilkan versi\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12298,162 +12415,162 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat namei(1).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "baca baris rtc"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "baca waktu sistem"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "ubah waktu rtc"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "set alarm rtc"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "aktifkan alarm rtc"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "set alarm bangun rtc"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "aktifkan alarm rtc"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "ubah waktu rtc"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: kondisi suspend tidak dikenal '%s'\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "gagal mendapatkan pid"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "gagal mendapatkan pid"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: mengasumsikan RTC menggunakan UTC ...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Menggunakan waktu UTC.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Menggunakan waktu lokal.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s: harus menyediakan waktu bangun\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s tidak aktif untuk even bangun\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarm %ld, sys_time %ld, rtc_time %ld, detik %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, fuzzy, c-format
 msgid "time doesn't go backward to %s"
 msgstr "%s: waktu tidak pergi mundur ke %s\n"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: bangun dari \"%s\" menggunakan %s di %s\n"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: bangun dari \"%s\" menggunakan %s di %s\n"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "gagal menjalankan %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "gagal membaca: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 #, fuzzy
 msgid "disable rtc alarm interrupt failed"
 msgstr "menonaktifkan interupsi alarm rtc"
@@ -12527,16 +12644,16 @@ msgstr ""
 "%s: %s\n"
 "Coba `%s --help' untuk informasi lebih lanjut.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: Arsitektur tidak dikenal"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Argumen tidak cukup"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Gagal menset personality ke %s"
@@ -12623,20 +12740,19 @@ msgstr "%s menggunakan IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s menggunakan polling\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "penggunaan: %s [pilihan] <aplikasi> [arg ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "Jalankan aplikasi dengan beberapa ruang nama tidak terbagi dari induknya\n"
 "\n"
@@ -12646,8 +12762,7 @@ msgstr ""
 "  -i, --ipc         unshare ruang nama Sistem V IPC\n"
 "  -n, --net         unshare ruang nama jaringan\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12655,149 +12770,149 @@ msgstr ""
 "\n"
 "Untuk informasi lebih lanjut lihat unshare(1).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshare gagal"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount tidak dapat menset grup id: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: tidak dapat menset id pengguna: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: tidak dapat mengeksekusi %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "error: mengubah direktori kerja ke %s."
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: tidak dapat menemukan process \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: tidak dapat mengeksekusi %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "gagal mengalokasikan outbuffer"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "nilai waktu timeout buruk: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Argumen tidak cukup"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "gagal mengalokasikan outbuffer"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "kecepatan yang buruk: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "terlalu banyan kecepatan alternative"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: tidak dapat membuka sebagai standard input: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: bukan sebuah character device"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: tidak dapat membuka untuk baca/tulis"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: masalah dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "tipe: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: membaca: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: masukan overrun"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12809,72 +12924,66 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "pengguna"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "pengguna"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Penggunaan: %s [pilihan]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "unshare gagal"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "stat gagal: %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "adalah y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "adalah n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "pembuatan semaphor gagal"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "id tidak valid: %s\n"
@@ -12890,52 +12999,46 @@ msgstr ""
 "Penggunaan `%s [pilihan] %s' jika anda benar - benar ingin menggunakannya.\n"
 "Script tidak berjalan.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "Tidak dapat membuka berkas pewaktu %s"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script dimulai, file adalah %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script dimulai di %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: tidak dapat menulis berkas script, error: %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12944,79 +13047,76 @@ msgstr ""
 "\n"
 "Script selesai di %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script selesai, file adalah %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty gagal\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Out of pty's\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <berkaspewaktu> [<tipescript> [<pembagi>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "diduga sebuah nomor, tetapi diperoleh '%s'"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "pembagi '%s'"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "gagal menulis ke stdout"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "akhir dari berkas tidak diduga di %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "gagal membaca typescript berkas %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "diduga sebuah nomor, tetapi diperoleh '%s'"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "Tidak dapat membuka berkas typescript %s"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "gagal membaca berkas pewaktu %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "berkas pewaktu %s: %lu: format yang tidak terduga"
@@ -13027,50 +13127,47 @@ msgid "Argument error."
 msgstr "%s: Argument error, penggunaan\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13080,61 +13177,61 @@ msgstr ""
 "Untuk informasi lebih lanjut lihat wipefs(8).\n"
 "\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "tidak dapat memaksa penghapusan\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "tidak dapat memaksa unblank\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "tidak dapat memperoleh status penghapusan\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "tidak dapat meng-unset mode powersave\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "tidak dapat membuka perangkat %s untuk menulis\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl error: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Error menulis screendump\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Tidak dapat membaca %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM tidak didefinisikan.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: signal tidak diketahui %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13162,144 +13259,149 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "pilihan tidak valid"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "nilai waktu timeout buruk: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: tidak dapat membuka file sementara.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: tidak dapat menset id pengguna: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Tidak dapat memperoleh ukuran disk"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Pesan Broadcast dari %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: tidak dapat membaca %s - gunakan stdin.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s: stat gagal"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "gagal membaca: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Penggunaan: %s [pilihan] pathname [pathname ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: tidak dapat mencari nama dari tty's anda\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: iji menulis anda tidak aktif.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s tidak di catat di %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s memiliki message dimatikan di %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s tidak dicatat di\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s memiliki message dimatikan\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s dicatat dalam lebih dari satu; menulis di %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Baris input terlalu panjang.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Pesan dari %s@%s (sebagai %s) di %s pada %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Pesan dari %s@%s di %s pada %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc gagal"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Penggunaan: %s [pilihan]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13484,7 +13586,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13687,7 +13789,7 @@ msgstr ""
 "\n"
 "Pattern tidak ditemukan\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Pattern tidak ditemukan"
 
@@ -13752,7 +13854,7 @@ msgstr "hexdump: format buruk {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: karakter konversi buruk %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13805,7 +13907,7 @@ msgstr ""
 "Lihat pg(1) untuk informasi lebih lanjut.\n"
 "-------------------------------------------------------\n"
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13813,81 +13915,81 @@ msgstr ""
 "%s: Penggunaan: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] "
 "[files]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: pilihan membutuhkan sebuah argumen -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: pilihan illegal -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...melewati forward\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...melewati backward\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Tidak ada file selanjutnya"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Tidak ada file sebelumnya"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Read error dari file %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF tidak diperkirakan dalam file %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Error tidak diketahui dalam file %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Tidak dapat membuat tempfile\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE error: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Tidak ada yang diingat string pencarian"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Tidak dapat dibuka "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "disimpan"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !command tidak diperbolehkan dalam mode rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() gagal, coba lagi nanti\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(File selanjutnya: "
 
@@ -13959,8 +14061,8 @@ msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13976,39 +14078,152 @@ msgstr "gagal mendapatkan pid"
 msgid "no input file specified"
 msgstr "nama berkas tidak dispesifikasikan."
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "bermasalah dalam pembacaan terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "escape sequence tidak diketahui pada input: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Baris input terlalu panjang.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Penggunaan:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Error dalam menutup file\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr ""
+#~ "Maaf Anda mungkin telah merubah Tag dari sebuah partisi yang tidak "
+#~ "kosong.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Peringatan: partisi %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Peringatan: partisi %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "dan %s overlap\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "perangkat: sesuatu seperti /dev/hda atau /dev/sda"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd bytes ["
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Penggunaan:\n"
+#~ " %1$s -a [-e] [-v] [-f]             mengaktifkan seluruh swap dari /etc/"
+#~ "fstab\n"
+#~ " %1$s [-p prioritas] [-v] [-f] <spesial> mengaktifkan swap yang "
+#~ "diberikan\n"
+#~ " %1$s -s                            menampilkan ringkasan pengunaan swap\n"
+#~ " %1$s -h                            menampilkan bantuan\n"
+#~ " %1$s -V                            menampilkan versi\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Penggunaan:\n"
+#~ " %1$s -a [-v]                      menonaktifkan seluruh swaps\n"
+#~ " %1$s [-v] <spesial>               menonaktifkan swap yang diberikan\n"
+#~ " %1$s -h                           menampilkan bantuan\n"
+#~ " %1$s -V                           menampilkan versi\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Penggunaan: %s [pilihan] <nama berkas>\n"
+#~ "\n"
+#~ "Pilihan:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Penggunaan: %s [pilihan]\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Penggunaan: %s [pilihan] <nama berkas>\n"
+#~ "\n"
+#~ "Pilihan:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Penggunaan: %s [pilihan] perangkat ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -14155,30 +14370,11 @@ msgstr "Baris input terlalu panjang.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [atau --help]:    tampilkan pesan ini"
 
-#~ msgid "dangerous options:"
-#~ msgstr "pilihan yang berbahaya:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [atau --show-geometry]: tampilkan ide kernel mengenai geometri"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [atau --show-pt-geometry]: tampilkan geometry yang ditebak dari "
-#~ "tabel partisi"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [atau --show-extended]: juga menampilkan partisi extended dalam "
-#~ "output\n"
-#~ "                               atau memperkirakan deskripsi dari partisi "
-#~ "di input"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14237,52 +14433,9 @@ msgstr "Baris input terlalu panjang.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [pilihan] [--] optstring parameters\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [pilihan] -o | --options optstring [pilihan] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              parameters\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Membolehkan pilihan panjang dimulai dengan "
-#~ "sebuah -\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Ini sedikit petunjuk penggunaan\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=longopts   Pilihan panjang yang dikenal\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=progname          Nama dimana error tersebut dilaporkan\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=optstring      Pilihan pendek yang dikenal\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Mematikan laporan error oleh getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Tidak ada output normal\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr "  -s, --shell=shell            Mengeset shell quoting conventions\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Test untuk versi getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 Jangan quote output\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Tampilkan informasi versi\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (ditingkatkan) 1.1.4\n"
 
diff --git a/po/it.po b/po/it.po
index 6aa3cb6b4..8fbebc11c 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2008-04-18 13:44+0100\n"
 "Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -108,29 +108,29 @@ msgstr "rileggi la tabella delle partizioni"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "visualizza la dimensione in settori da 512 byte"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "impossibile aprire %s"
@@ -209,7 +209,7 @@ msgid "Verifying ... "
 msgstr "Verifica in corso... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Impossibile aprire il file '%s'"
@@ -249,15 +249,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -270,7 +270,7 @@ msgstr "%s da %s\n"
 msgid "cannot stat file %s"
 msgstr "impossibile eseguire stat sul dispositivo %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -321,8 +321,8 @@ msgid "stat failed: %s"
 msgstr "(File successivo: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty non riuscita\n"
@@ -552,55 +552,55 @@ msgstr "id non valido: %s\n"
 msgid "compiled without -x support"
 msgstr "%s: è stato compilato senza il supporto per -x\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s [-larvsmf] /dev/nome\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s è montato.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Continuare?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "controllo interrotto.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr " N. zona < FIRSTZONE nel file `%s'"
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "N. Zona >= ZONES nel file `%s'"
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Rimuovere blocco"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Errore di lettura: ricerca del blocco nel file '%s' impossibile\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Errore di lettura: blocco danneggiato nel file '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -609,297 +609,297 @@ msgstr ""
 "Errore interno: nel tentativo di scrivere il blocco danneggiato\n"
 "ignorata la richiesta di scrittura\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "tentativo fallito in write_block "
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Errore di scrittura: blocco danneggiato nel file '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "ricerca fallita in write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "impossibile scrivere in super-block"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Impossibile scrivere nella mappa di inode"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Impossibile scrivere nella mappa di zona"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Impossibile scrivere inode"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "ricerca non riuscita"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "impossibile allocare i buffer per le mappe"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "impossibile leggere super block"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "numero magico danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "È supportato solamente 1k blocchi/zone"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "campo s_imap_blocks danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "campo s_zmap_blocks danneggiato in super-block"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Impossibile allocare il buffer per la mappa inode"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Impossibile allocare il buffer per la mappa zone"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Impossibile allocare il buffer per gli inode"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Impossibile allocare il buffer per il conteggio inode"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Impossibile allocare il buffer per il conteggio zona"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Impossibile leggere la mappa inode"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Impossibile leggere la mappa di zona"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Impossibile leggere gli inode"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Attenzione: prima zona != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "Inode %ld\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "blocchi %ld\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Prima zona dati=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Dimensione zona=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Dimensione massima=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stato del filesystem=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "lunghezzanom=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "Inode %d contrassegnato non utilizzato, ma utilizzato per il file '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Segno in uso"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Il file `%s' ha modalità %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Attenzione: conteggio inode troppo grande.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "l'inode radice non è una directory"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Il blocco è stato utilizzato in precedenza. Ora nel file `%s'"
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Cancella"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Il blocco %d nel file `%s' è marcato come non in uso."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Corretto"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "La directory '%s' contiene un numero inode non corretto per il file '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Rimuovere"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: directory danneggiata: '.' non è la prima\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: directory danneggiata: '..' non è la seconda\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "errore interno"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: directory danneggiata: dimensione < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "ricerca in bad_zone non riuscita"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Modalità dell'inode %d non cancellata."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inode %d non utilizzato, inode contrassegnato utilizzato in bitmap"
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inode %d utilizzato, inode contrassegnato non utilizzato in bitmap."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Imposta"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modalità = %07o), i_nlinks=%d, conteggiati=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Impostare i_nlinks da conteggiare"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zona %d: contrassegnata in uso, nessun file la utilizza."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Non contrassegnata"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zona %d: utilizzata, conteggiati=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zona %d: non in uso, conteggiati=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "dimensione inode non corretta"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "dimensione inode v2 non corretta"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "terminale necessario per le riparazioni interattive"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "impossibile aprire '%s'"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "'%s' è corretto, non controllare.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Forzatura controllo filesystem su %s in corso.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Il filesystem su %s è danneggiato, controllo necessario.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -908,12 +908,12 @@ msgstr ""
 "\n"
 "%6ld inode utilizzati (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zone utilizzate (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -936,7 +936,7 @@ msgstr ""
 "------\n"
 "%6d file\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1060,7 +1060,7 @@ msgstr "troppi inode - il massimo è 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "spazio insufficiente, sono necessari almeno %lu blocchi"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -1213,10 +1213,8 @@ msgstr "%6.2f%% (%+d byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Errore durante la chiusura del file\n"
+msgid "cannot close file %s"
+msgstr "Impossibile aprire il file '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1326,89 +1324,99 @@ msgstr ""
 "ATTENZIONE: numeri di device troncati a %u bit. Questo significa quasi\n"
 "certamente che alcuni file di device saranno sbagliati.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Uso: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s è montata; qui non verrà creato un filesystem!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr ""
 "tentativo di effettuare il boot del blocco in write_tables non riuscito"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "impossibile cancellare il settore di boot"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "ricerca in write_tables non riuscita"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "impossibile scrivere in super-block"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "impossibile scrivere nella mappa degli inode"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "impossibile scrivere nella mappa delle zone"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "impossibile scrivere inode"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "tentativo fallito in write_block "
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "scrittura in write_block non riuscita"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "troppi blocchi danneggiati"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "numero insufficiente di blocchi corretti"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "impossibile allocare i buffer per le mappe"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "impossibile allocare i buffer per le mappe"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "impossibile allocare il buffer per gli inode"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "Inode %ld\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "blocchi %ld\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1417,97 +1425,97 @@ msgstr ""
 "Dimensione max=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "ricerca non riuscita durante il controllo dei blocchi"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valori strani in do_check: probabilmente sono presenti dei bug\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "ricerca in check_blocks non riuscita"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "blocchi danneggiati prima dell'area dati: impossibile creare fs"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocchi danneggiati\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "un blocco danneggiato\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "impossibile aprire il file dei blocchi danneggiati"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "Impossibile leggere l'unità disco"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "dimensione inode non corretta"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "errore strtol: numero di blocchi non specificato"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s non riuscito.\n"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty non riuscita\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: device occupato"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "impossibile ottenere la dimensione di %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "non si tenterà di creare un filesystem su '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Numero di settori"
@@ -1844,7 +1852,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "ricerca in write_tables non riuscita"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2191,7 +2199,7 @@ msgid "   Logical"
 msgstr "   Logico"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -2873,12 +2881,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Comando disklabel BSD (m per richiamare la guida): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Primo %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ultimo %s o +size o +sizeM o +sizeK "
@@ -3024,7 +3032,7 @@ msgid "tracks/cylinder"
 msgstr "tracce/cilindro"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cilindri"
 
@@ -3091,12 +3099,12 @@ msgstr "È stato creato il numero massimo di partizioni\n"
 msgid "This partition already exists.\n"
 msgstr "Questa partizione esiste già.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Attenzione: troppe partizioni (%d, il massimo è %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3299,7 +3307,7 @@ msgstr "Si devono impostare"
 msgid "heads"
 msgstr "testine"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "settori"
 
@@ -3729,7 +3737,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Avvio    Inizio    Fine   Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -3814,7 +3822,7 @@ msgstr "Numero totale dei settori allocati %ld superiore al massimo %lld\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld settori non allocati\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3964,39 +3972,39 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Sincronizzazione dei dischi in corso.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "La partizione %d non ha area dati\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nuovo inizio dati"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Comando per esperti (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Numero di cilindri"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Numero di testine"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Numero di settori"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Attenzione: impostare l'offset di settore per assicurare compatibilità con "
 "DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4005,34 +4013,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Il disco %s non contiene una tabella delle partizioni valida\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "impossibile aprire %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando sconosciuto\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Questo kernel trova la dimensione del settore in maniera indipendente - - "
 "opzione b ignorata\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4041,16 +4049,16 @@ msgstr ""
 "Attenzione: l'opzione -b (mpostazione della dimensione del settore) si "
 "dovrebbe utilizzare con un dispositivo specificato\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Comando (m per richiamare la guida): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4059,16 +4067,16 @@ msgstr ""
 "\n"
 "Il file d'avvio corrente è: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Immettere il nome del nuovo file d'avvio:"
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "File d'avvio immutato\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4394,9 +4402,10 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tSi è selezionato un nome file di avvio non comune.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "È possibile modificare solamente il tag delle partizioni non vuote.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr ""
+"Spiacente, solamente il superutente può modificare il clock di sistema.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4413,7 +4422,7 @@ msgstr ""
 "Digitare YES (sì) se si è certi di voler codificare questa partizione in "
 "modo differente.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr ""
 
@@ -4610,7 +4619,7 @@ msgstr "Intervallo inutilizzato - settori 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervallo inutilizzato - settori %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4619,7 +4628,7 @@ msgstr ""
 "Altre partizioni coprono già il disco intero.\n"
 "Eliminarne alcune/rimpicciolirle prima di riprovare.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4628,12 +4637,12 @@ msgstr ""
 "Si raccomanda che l'undicesima partizione\n"
 "copra l'intero disco e sia di tipo \"SGI volume\"\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4644,7 +4653,7 @@ msgstr ""
 "%d %s copre alcune altre partizioni. La voce immessa è stata cambiata\n"
 "in %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4654,7 +4663,7 @@ msgstr ""
 "in considerazione di lasciare questa partizione come disco intero (5), "
 "partendo da 0, con %u settori\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4670,7 +4679,7 @@ msgstr ""
 "Digitare YES  (sì) se si è certi di volere che quella partizione\n"
 "venga codificata con 82 (swap Linux ): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4690,7 +4699,7 @@ msgstr ""
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4703,28 +4712,28 @@ msgstr ""
 "Unità = %s di %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flag    Inizio       Fine    Blocchi   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Numero di cilindri alternativi"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Settori supplementari per cilindro"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Fattore di interleave"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Velocità di rotazione (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Numero dei cilindri fisici"
 
@@ -5186,7 +5195,7 @@ msgstr "Disco %s: impossibile ottenere la geometria\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: impossibile ottenere la dimensione\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5197,22 +5206,22 @@ msgstr ""
 "l'intero disco. Utilizzare fdisk su di esso probabilmente non ha senso.\n"
 "[Utilizzare l'opzione --force se lo si desidera davvero]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %lu testine\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Attenzione: HDIO_GETGEO dice che vi sono %lu settori\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Attenzione: BLKGETSIZE/HDIO_GETGEO dice che vi sono %lu cilindri\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5222,7 +5231,7 @@ msgstr ""
 "63\n"
 "Questo creerà problemi con i software che utilizza l'indirizzamento C/H/S.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5231,7 +5240,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindri, %lu testine, %lu settori/traccia\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5239,7 +5248,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per la testina: %lu "
 "(dovrebbe essere in 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5248,7 +5257,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per il settore: %lu "
 "(dovrebbe essere in 1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5257,7 +5266,7 @@ msgstr ""
 "%s della partizione %s ha un valore impossibile per i cilindri: %lu "
 "(dovrebbe essere in 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5266,12 +5275,12 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Rilettura della tabella delle partizioni in corso...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5281,26 +5290,26 @@ msgstr ""
 "Il comando per la rilettura della tabella delle partizioni non è riuscito\n"
 "Riavviare adesso il sistema prima di utilizzare mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Errore durante la chiusura di %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: nessuna partizione di questo tipo\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "formato non riconosciuto - utilizzo dei settori in corso\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato non implementato - utilizzo di %s in corso\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5309,13 +5318,13 @@ msgstr ""
 "Unità = cilindri di %lu byte, blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "   Dispositivo Boot Inizio      Fine   #cilin.   #blocchi   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5324,12 +5333,12 @@ msgstr ""
 "Unità = settori di 512 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Dispositivo Boot    Inizio      Fine  #settori Id  Sistema\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5338,12 +5347,12 @@ msgstr ""
 "Unità = blocchi di 1024 byte, conteggiando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Dispositivo  Boot  Inizio       Fine  #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5352,31 +5361,31 @@ msgstr ""
 "Unità = mebibyte da 1048576 byte, blocchi da 1024 byte, contando da %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Dispositivo Inizio Boot   Fine    MB   #blocchi  Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tinizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tendenza: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Non si è trovata alcuna partizione\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5387,53 +5396,43 @@ msgstr ""
 "  per C/H/S=*/%ld/%ld (al posto di %ld/%ld/%ld).\n"
 "In questo elenco verrà assunta tale geometria.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "nessuna tabella delle partizioni presente.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "strano, sono definite solo %d partizioni.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Attenzione: la partizione %s ha dimensione 0 ma non è contrassegnata come "
 "vuota\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 ed è avviabile\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Attenzione: la partizione %s ha dimensione 0 e inizio non nullo\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Attenzione: la partizione %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "non è contenuta nella partizione %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Attenzione: le partizioni %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "e %s si sovrappongono\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Attenzione: la partizione %d è vuota\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5442,17 +5441,17 @@ msgstr ""
 "Attenzione: la partizione %s contiene parte della tabella delle partizioni\n"
 "(settore %lu), e la distruggerà quando viene riempita.\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Attenzione: la partizione %s inizia al settore 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Attenzione: la partizione %s si estende dopo la fine del disco\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5460,17 +5459,17 @@ msgstr ""
 "Tra le partizioni primarie, al massimo una può essere estesa\n"
 "  (anche se questo non è un problema per Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non inizia al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Attenzione: la partizione %s non termina al limite di un cilindro\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5479,7 +5478,7 @@ msgstr ""
 "(attiva)\n"
 "Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5487,7 +5486,7 @@ msgstr ""
 "Attenzione: di solito l'avvio è possibile solo da partizioni primarie\n"
 "LILO non prende in considerazione il flag \"bootable\" (avviabile).\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5496,40 +5495,40 @@ msgstr ""
 "(attiva)\n"
 "Questo non ha importanza per LILO, ma MBR DOS non avvierà questo disco.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "inizio"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partizione %s: inizio: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "fine"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 " partizione %s: fine: (c,h,s) previsto (%ld,%ld,%ld) trovato (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "la partizione %s termina sul cilindro %ld, oltre la fine del disco\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5537,133 +5536,133 @@ msgstr ""
 "Attenzione: la partizione estesa non inizia al limite di un cilindro.\n"
 "DOS e Linux interpreteranno i contenuti in modo diverso.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "troppe partizioni - sto ignorando quei numeri passati (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "struttura delle partizioni?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "rilevato l'amministratore del disco - impossibile da gestire\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "trovata firma DM6 - termina\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "strano..., una partizione estesa di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "strano..., una partizione BSD di dimensione 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: tipo di tabella delle partizioni non riconosciuto\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "flag -n dato: nessuna modifica\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Salvataggio dei vecchi settori non riuscito - interruzione in corso\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "linea di input lunga o incompleta - uscita in corso\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "errore di input: \"=\" previsto dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "errore di input: carattere non previsto %c dopo il campo %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "input non riconosciuto: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "numero troppo grande\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "segni strani dopo il numero\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "non c'è spazio per il descrittore di partizione\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "impossibile costituire una partizione estesa adiacente\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "troppi campi di input\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Non c'è spazio per altri\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Tipo non valido\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Attenzione: la dimensione indicata (%lu) è superiore alla dimensione massima "
 "consentita (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Attenzione: partizione vuota\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Attenzione: inizio partizione non valido (%lu troppo anticipato)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "flag avviabile non riconosciuto - scegliere - o *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "Specificazione c,h,s parziale?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "partizione estesa in posizione non prevista\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "input non valido\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "troppe partizioni\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5676,99 +5675,180 @@ msgstr ""
 "Solitamente è necessario specificare solamente <inizio> e <dimensione> ( e "
 "forse <tipo>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Uso: %s [opzioni] dispositivo...\n"
+msgstr "Uso:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d partizioni:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "opzioni pericolose:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [o --show-pt-geometry]: stampa la geometria stimata in base alla\n"
+"                               tabella delle partizioni"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
+"                            o prevede i rispettivi descrittori in input"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s device\t\t elenca le partizioni attive sul dispositivo\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s device n1 n2 ... attiva le partizioni n1 ..., disattiva il resto\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An device\t attiva la partizione n, disattiva le altre\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5777,63 +5857,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "nessun comando?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totale: %llu blocchi\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id numero partizione dispositivo\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Uso: sfdisk --change-id numero partizione dispositivo Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id numero partizione dispositivo [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 "è possibile specificare solamente un dispositivo(eccetto con -l o -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "impossibile aprire %s in lettura e scrittura\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "impossibile aprire %s in lettura\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindri, %ld testine, %ld settori/traccie\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "impossibile ottenere la dimensione di %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte attivo non valido: 0x%x al posto di 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5841,7 +5921,7 @@ msgstr ""
 "Fine\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5850,37 +5930,37 @@ msgstr ""
 "Ci sono %d partizioni primarie attive. Questo è irrelevante per LILO,\n"
 "ma MBR DOS  avvierà solamente un disco con 1 partizione attiva.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "la partizione %s ha id %x e non è nascosta\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id non valido %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Questo disco è attualmente in uso.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Errore irreversibile: impossibile trovare %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Attenzione: %s non è un dispositivo a blocchi\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 "Verifica in corso che in questo momento nessuno stia utilizzando questo "
 "disco...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5894,30 +5974,30 @@ msgstr ""
 "disco.\n"
 "Usare l'opzione --no-reread per eliminare questo controllo.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Utilizzare il flag -force per oltrepassare tutti i controlli.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Vecchia situazione:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "La partizione %d non esiste, non è possibile modificarla\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Nuova situazione:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5925,21 +6005,21 @@ msgstr ""
 "Queste partizioni non mi piacciono - nessuna modifica\n"
 "(se questo è quanto si desidera, utilizzare l'opzione --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Questo non mi piace - probabilmente si dovrebbe rispondere no\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Soddisfatti di questo? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Scrivere questo su disco? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5948,16 +6028,16 @@ msgstr ""
 "\n"
 "sfdisk: fine prematura dell'input\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Uscita in corso - nessuna modifica\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Scegliere un'opzione per la risposta tra y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5966,7 +6046,7 @@ msgstr ""
 "La nuova tabella delle partizioni è stata scritta con successo\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5998,101 +6078,103 @@ msgstr "Sincronizzazione dei dischi in corso.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s riuscito.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s non riuscito.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: impossibile aprire %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: non trovato"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: errore %d durante la decompressione! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s no è un lp device.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Forzatura controllo filesystem su %s in corso.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6100,58 +6182,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s no è un lp device.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Impossibile aprire %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "eseguito umount di %s\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Smontaggio in corso di qualsiasi filesystem rimanente..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Smontaggio in corso di qualsiasi filesystem rimanente..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: argomento sconosciuto: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6170,33 +6252,82 @@ msgstr "opzione lunga vuota dopo parametro -l o --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "shell sconosciuta dopo parametro -s o --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "      getopt [opzioni] -o|--options optstring [opzioni] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Consente le opzioni lunghe che iniziano con "
+"un singolo -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Questa piccola guida all'utilizzo\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=longopts   Opzioni lunghe da riconoscere\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
 msgstr ""
+"  -n, --name=progname          Il nome con il quale vengono riportati gli "
+"errori\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=optstring      Opzioni brevi da riconoscere\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Disattiva errore riportato da getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Nessun output normale\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=shell            Imposta la shell \n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Prova della versione getopt(1)\n"
+
+# FIXME UPSTREAM: unqote
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 Non cita l'output\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Mostra le informazioni sulla versione\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "argomento optstring mancante"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "errore interno, contattare l'autore."
 
@@ -6667,93 +6798,111 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Impossibile impostare il valore epoch nel kernel.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d partizioni:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                indicano al hwclock il tipo di alpha utilizzato (consultare "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "Impossibile impostare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s non considera argomenti che non siano opzioni. È stato fornito %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6762,7 +6911,7 @@ msgstr ""
 "Sono state specificate multiple funzioni.\n"
 "È possibile eseguire una sola funzione per volta.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6771,7 +6920,7 @@ msgstr ""
 "%s: Le opzioni --utc e -localtime si escludono vicendevolmente. Sono state "
 "specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6780,7 +6929,7 @@ msgstr ""
 "%s: Le opzioni --adjust e -noadjfile si escludono vicendevolmente. Sono "
 "state specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6789,30 +6938,30 @@ msgstr ""
 "%s: Le opzioni --adjust e -noadjfile si escludono vicendevolmente. Sono "
 "state specificate entrambe.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: Con --noadjfile, occorre specificare o --utc o --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 "Impossibile utilizzare l'ora impostata. Impossibile impostare il clock.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr ""
 "Spiacente, solamente il superutente può modificare il clock hardware.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr ""
 "Spiacente, solamente il superutente può modificare il clock di sistema.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6820,11 +6969,11 @@ msgstr ""
 "Solamente il supeutente può modificare l'epoca del clock hardware nel "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7009,7 +7158,7 @@ msgid "failed to read mtab"
 msgstr "impossibile fare stat di %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "Impossibile allocare il buffer.\n"
@@ -7051,45 +7200,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7098,27 +7287,27 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: mount non riuscito"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "Impossibile allocare il buffer.\n"
@@ -7207,7 +7396,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "chsh: errore PAM, interruzione in corso: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Password: "
 
@@ -7656,47 +7845,48 @@ msgstr "Linefeed ECCESSIVI"
 msgid "too many bare linefeeds."
 msgstr "troppi linefeed vuoti.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Login scaduto dopo %d secondi\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ultimo login: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "da %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "su %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "Apertura di %s non riuscita"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ERRORE DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ERRORE DI LOGIN SU %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ERRORI DI LOGIN DA %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ERRORI DI LOGIN SU %s, %s"
@@ -7726,7 +7916,7 @@ msgstr "mount: autorizzazione negata"
 msgid "setuid failed"
 msgstr "setuid() non riuscito"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "exec fallita\n"
@@ -7773,8 +7963,8 @@ msgstr ""
 "%s: impossibile sbloccare %s: %s (le modifiche effettuate sono ancora in "
 "%s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "fork non riuscito\n"
@@ -7829,24 +8019,21 @@ msgstr "valore dell'anno non valido: usare 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Uso: cal [-13smjyV] [[mese] anno]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7958,32 +8145,32 @@ msgstr " Rimuovere"
 msgid "failed to add line to output"
 msgstr "Impossibile allocare il buffer.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "errore di posizionamento"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "Impossibile allocare il buffer.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: impossibile leggere %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "Impossibile allocare il buffer.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc() non riuscita"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7994,49 +8181,74 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Comandi disponibili:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8045,42 +8257,42 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Nessuna directory %s!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "Impossibile allocare il buffer.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "Impossibile allocare il buffer.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "Impossibile allocare il buffer.\n"
@@ -8105,12 +8317,12 @@ msgstr "%s: impossibile trovare il processo \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: segnale sconosciuto %s; segnali validi:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Uso: %s [ -s segnale | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ segnale ]\n"
@@ -8130,84 +8342,83 @@ msgstr "Dimensioni blocco: %d\n"
 msgid "connect %s"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(File successivo: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Valore fuori intervallo.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: nome funzionalità sconosciuto: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: nome priorità sconosciuto: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8345,7 +8556,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: impossibile aprire: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8363,12 +8574,13 @@ msgstr "%s: impossibile aprire: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8376,7 +8588,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8399,7 +8611,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8408,33 +8620,33 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Impossibile aprire %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Ottenuti %d byte da %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "exec fallita\n"
@@ -8454,24 +8666,12 @@ msgstr "impossibile eseguire stat sul dispositivo %s"
 msgid "%s - No such file or directory\n"
 msgstr "l'inode radice non è una directory"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "Uso: namei [-mx] nome percorso [nome percorso ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d partizioni:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8483,8 +8683,8 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, fuzzy, c-format
+#: misc-utils/namei.c:425
+#, fuzzy
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8492,12 +8692,12 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date argomento troppo lungo\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8507,169 +8707,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: impossibile rinominare %s in %s: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argomento -l non valido per %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Scrivi"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "lettura di %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "impossibile fare stat di %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Impossibile aprire %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Errore durante la lettura di %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "id non valido"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "id non valido"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: valore non valido\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8677,29 +8875,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8735,32 +8932,33 @@ msgid "%s: write failed"
 msgstr "openpty non riuscita\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "byte"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8769,11 +8967,11 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8867,65 +9065,65 @@ msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "impossibile rinominare %s in %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: l'utente \"%s\" non esiste.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", cifratura %s (tipo %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", offset %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", tipo di cifratura %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: impossibile ottenere informazioni sul device %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
 # FIXME
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: impossibile trovare un loop device libero"
 
 # FIXME: loop device
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8935,56 +9133,54 @@ msgstr ""
 "       non è a conoscenza del loop device (se è questo il caso,\n"
 "       occorre ricompilare o eseguire \"modprobe loop\")."
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Memoria insufficiente quando si amplia il buffer.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Il settore %d è già allocato\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s è protetto da scrittura, viene montato in sola lettura"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): riuscito\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): riuscito\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: impossibile eliminare il device %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Questo mount è stato compilato senza supporto per loop. Ricompilare.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8992,51 +9188,48 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: impossibile aprire il device %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: device occupato"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9563,163 +9756,166 @@ msgstr "bug in chiamata xstrndup"
 msgid "not enough memory"
 msgstr "memoria insufficiente"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: EOF non previsto nel file %s\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "exec fallita\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() non riuscito"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "ricerca non riuscita"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Apertura di %s non riuscita"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Nome"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: attenzione: %s ha permessi %04o non sicuri, si suggerisce %04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: attenzione: %s ha permessi %04o non sicuri, si suggerisce %04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: file %s ignorato - sembra avere dei buchi.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "ricerca non riuscita"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s su %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s non riuscito.\n"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: impossibile trovare il dispositivo per %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "Non superutente.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s non riuscito.\n"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9993,7 +10189,7 @@ msgstr "Partizione selezionata %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10053,19 +10249,13 @@ msgstr "   p   stampa della tabella delle partizioni BSD"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Il disco %s non contiene una tabella delle partizioni valida\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10076,21 +10266,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Comandi disponibili:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10099,26 +10288,26 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "Impossibile allocare il buffer.\n"
@@ -10246,7 +10435,7 @@ msgstr "Scrittura della partizione su %s non riuscita\n"
 msgid "failed to set pid %d's policy"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() non è riuscito a leggere l'orario da %s"
@@ -10522,7 +10711,7 @@ msgstr "%s: %ld soglia predefinita e %ld timeout predefinito\n"
 msgid "Can't set signal handler"
 msgstr "Impossibile impostare un gestore del segnale"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday non riuscito"
 
@@ -10531,25 +10720,25 @@ msgstr "gettimeofday non riuscito"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Impossibile eseguire CYGETMON su %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f int/sec; %f rec, %f send (car/sec)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/sec; %f rec (car/sec)\n"
@@ -10641,124 +10830,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "impossibile aprire %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Uso: %s [opzioni] dispositivo...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Comando sconosciuto: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Nessuna directory %s!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync non riuscito "
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(File successivo: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "nessun comando?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync non riuscito "
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10766,7 +10938,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10775,36 +10947,36 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Argomenti insufficienti"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valore impostato non valido: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "Opzione --date non specificata.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "numero massimo di segmenti = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty non riuscita\n"
@@ -10812,63 +10984,64 @@ msgstr "openpty non riuscita\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s richiede un argomento\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: impossibile aprire %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: valore non valido\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "fork non riuscito\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -10876,38 +11049,37 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "Opzione --date non specificata.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "Opzione --date non specificata.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s non riuscito.\n"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "l'inode radice non è una directory"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "openpty non riuscita\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "openpty non riuscita\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10916,8 +11088,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -10925,96 +11097,87 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() non è riuscito a leggere l'orario da %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "Opzione --date non specificata.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "l'inode radice non è una directory"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "openpty non riuscita\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Uso: %s [opzioni] dispositivo...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, fuzzy, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Segmento memoria condivisa shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "Coda di messaggi msqid=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "semafori allocati = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11510,8 +11673,8 @@ msgstr ""
 "Segmento memoria condivisa shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11520,8 +11683,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11554,8 +11717,8 @@ msgstr ""
 "Coda di messaggi msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11588,8 +11751,8 @@ msgstr ""
 "matrice semafori semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11637,71 +11800,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s da %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "id non valido"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id non valido: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s non è un dispositivo speciale a blocchi"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "impossibile ottenere la dimensione di %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Ricerca sull'unità disco impossibile"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "impossibile aprire %s"
@@ -11858,36 +12019,31 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11896,12 +12052,12 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "l'inode radice non è una directory"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s è montato.\t"
@@ -11939,55 +12095,50 @@ msgstr ""
 "         -n            disabilita la rilevazione automatica del byte order\n"
 "\t -V            stampa la versione ed esce\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: errore durante la scrittura di %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): linea mappa errata\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: impossibile trovare \"_stext\" in %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "totale"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11996,8 +12147,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12005,73 +12156,64 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s da %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Comando sconosciuto: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "valore di timeout non valido: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "utente"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Scrittura della partizione su %s non riuscita\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: vecchia priorità %d, nuova priorità %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Uso: %s [opzioni] dispositivo...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12079,161 +12221,161 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "gettimeofday non riuscito"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "semafori allocati = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr ""
 "\n"
 "Errore durante la chiusura del file\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "ricerca non riuscita"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "semafori allocati = %d\n"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "gettimeofday non riuscito"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: tipo di tabella delle partizioni non riconosciuto\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: impossibile aprire: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Utilizzo di %s.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Utilizzo di %s.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s no è un lp device.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Messaggio da %s@%s su %s a %s ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Messaggio da %s@%s su %s a %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() non è riuscito a leggere l'orario da %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(File successivo: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12288,16 +12430,16 @@ msgstr ""
 "%s: %s\n"
 "Provare \"%s --help\" per ulteriori informazioni.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: architettura non riconosciuta"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Argomenti insufficienti"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "Scrittura della partizione su %s non riuscita\n"
@@ -12382,24 +12524,22 @@ msgstr "%s utilizzo di IRQ %d in corso\n"
 msgid "%s using polling\n"
 msgstr "%s utilizzo del polling in corso\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "Uso: %s programma [arg ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12407,150 +12547,150 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "ricerca non riuscita"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: impossibile impostare l'id di gruppo: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: impossibile impostare l'id utente: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: exec di %s impossibile: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "errore durante il cambiamento della modalità di %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: impossibile trovare il processo \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: exec di %s impossibile: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "Impossibile allocare il buffer.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "valore di timeout non valido: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Argomenti insufficienti"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "Impossibile allocare il buffer.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "velocità non valida: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "troppe velocità alternative"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: impossibile aprire come input standard: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: non è un dispositivo di caratteri"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: non è aperto per lettura/scrittura"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "tipo: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: lettura: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: sovraccarico input"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12562,69 +12702,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "utente"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "utenti"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "ricerca non riuscita"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(File successivo: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "è s\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "è n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "semafori allocati = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "id non valido: %s\n"
@@ -12640,52 +12774,46 @@ msgstr ""
 "Usare \"%s [opzioni] %s\" se si vuole veramente usarlo.\n"
 "Script non avviato.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "Impossibile aprire il file '%s'"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniziato, il file è %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniziato su %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: impossibile trovare il dispositivo per %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12694,80 +12822,77 @@ msgstr ""
 "\n"
 "Script effettuato su %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script effettuato, il file è %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty non riuscita\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Esauriti tutti i pty disponibili\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "Apertura di %s non riuscita"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() non è riuscito a leggere l'orario da %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "numero massimo di segmenti = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "Impossibile aprire il file '%s'"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() non è riuscito a leggere l'orario da %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: EOF non previsto nel file %s\n"
@@ -12778,50 +12903,47 @@ msgid "Argument error."
 msgstr "%s: argomento errato, uso\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12830,61 +12952,61 @@ msgstr ""
 "\n"
 "Per maggiori informazioni vedere setarch(8).\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "impossibile effettuare il fork"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "impossibile effettuare il fork"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "impossibile aprire %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr " impossibile (dis)impostare la modalità risparmio energetico\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "impossibile aprire il dispositivo %s per scrivere\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "errore klogctl : %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Errore in scrittura screendump\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Impossibile aprire %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM non è definito.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: segnale sconosciuto %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12912,142 +13034,144 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Uso: %s [opzioni] dispositivo...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "id non valido"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "valore di timeout non valido: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: impossibile aprire il file temporaneo.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: impossibile impostare l'id utente: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Impossibile ottenere la dimensione del disco"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Messaggio broadcast da %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: non verrà letto %s - usare stdin.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s non riuscito.\n"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(File successivo: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "Uso: namei [-mx] nome percorso [nome percorso ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: impossibile trovare il nome di tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: l'autorizzazione per la scrittura è disattivata.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s non è collegato a %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s ha i messaggi disattivati su %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s non è collegato\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s ha i messaggi disattivati\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s è collegato più di una volta; scrittura su %s in corso\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Linea di input troppo lunga.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Messaggio da %s@%s (come %s) su %s a %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Messaggio da %s@%s su %s a %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "malloc non riuscita"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13228,7 +13352,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13404,7 +13528,7 @@ msgstr ""
 "\n"
 "Pattern non trovato\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Pattern non trovato"
 
@@ -13470,7 +13594,7 @@ msgstr "hexdump: formato non valido {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: carattere di conversione non valido %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13498,88 +13622,88 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 "%s: Uso: %s [-numero] [-p stringa] [-cefnrs] [+riga] [+/modello/] [file]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: l'opzione richiede un argomento -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: opzione illecita -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Nessun file successivo"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Nessun file precedente"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Errore di lettura dal file %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF non previsto nel file %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Errore sconosciuto nel file %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Impossibile creare il file temporaneo\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr ""
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Nessuna stringa di ricerca ricordata"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Impossibile aprire "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "salvato"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() non riuscito, riprovare più tardi\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(File successivo: "
 
@@ -13649,8 +13773,8 @@ msgstr "Uso: %s [opzioni] dispositivo...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13666,39 +13790,106 @@ msgstr "%s: impossibile aprire: %s\n"
 msgid "no input file specified"
 msgstr "Opzione --date non specificata.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Uso: %s [opzioni] dispositivo...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "problemi leggendo terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Sequenza di escape sconosciuta in input: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Linea di input troppo lunga.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Uso:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Errore durante la chiusura del file\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr ""
+#~ "È possibile modificare solamente il tag delle partizioni non vuote.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Attenzione: la partizione %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Attenzione: le partizioni %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "e %s si sovrappongono\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "dispositivo: qualcosa come /dev/hda o /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "byte"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uso: %s [opzioni] dispositivo...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Uso: %s [opzioni] dispositivo...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13852,29 +14043,12 @@ msgstr "Linea di input troppo lunga.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [o --help]:     stampa questo messaggio"
 
-#~ msgid "dangerous options:"
-#~ msgstr "opzioni pericolose:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [o --show-geometry]: stampa l'idea del kernel riguardo alla "
 #~ "geometria"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [o --show-pt-geometry]: stampa la geometria stimata in base alla\n"
-#~ "                               tabella delle partizioni"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [o --show-extended]: elenca anche le partizioni estese in output\n"
-#~ "                            o prevede i rispettivi descrittori in input"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr "    -L  [o --Linux]:      non segnala le cose irrilevanti per Linux"
@@ -13934,55 +14108,9 @@ msgstr "Linea di input troppo lunga.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "      getopt [opzioni] [--] optstring parametri\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "      getopt [opzioni] -o|--options optstring [opzioni] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "             parametri\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Consente le opzioni lunghe che iniziano "
-#~ "con un singolo -\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Questa piccola guida all'utilizzo\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=longopts   Opzioni lunghe da riconoscere\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=progname          Il nome con il quale vengono riportati gli "
-#~ "errori\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=optstring      Opzioni brevi da riconoscere\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Disattiva errore riportato da getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Nessun output normale\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr "  -s, --shell=shell            Imposta la shell \n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Prova della versione getopt(1)\n"
-
-# FIXME UPSTREAM: unqote
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 Non cita l'output\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr ""
-#~ "  -V, --version                Mostra le informazioni sulla versione\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (avanzato) 1.1.4\n"
 
diff --git a/po/ja.po b/po/ja.po
index 204b18ffd..c93918e98 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.18-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-10-26 17:00+0900\n"
 "Last-Translator: Makoto Kato <makoto.kt@gmail.com>\n"
 "Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\n"
@@ -108,29 +108,29 @@ msgstr "パーティションテーブルを再読み込み"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "512バイトセクタのサイズを取得"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "%s を open できません"
@@ -215,7 +215,7 @@ msgid "Verifying ... "
 msgstr "照合します ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "ファイル '%s' を開けません"
@@ -255,15 +255,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -276,7 +276,7 @@ msgstr "%s from %s\n"
 msgid "cannot stat file %s"
 msgstr "デバイス %s を stat できません"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -325,8 +325,8 @@ msgid "stat failed: %s"
 msgstr "stat が失敗: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "open が失敗: %s"
@@ -549,55 +549,55 @@ msgstr "不正なファイルデータオフセット"
 msgid "compiled without -x support"
 msgstr "-x サポートなしでコンパイルされています"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "使い方: %s [ -larvsmf ] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s はマウントされています\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "本当に続けますか"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "チェックを中止しました\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "ファイル `%s' 内で Zone nr < FIRSTZONE。"
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "ファイル `%s' 内で Zone nr >= ZONES。"
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "ブロックの削除"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "読込エラー: ファイル '%s' 中のブロックへ seek できません\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "読込エラー: ファイル '%s' に不正ブロックがあります\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -606,296 +606,296 @@ msgstr ""
 "内部エラー: 不正ブロックへの書き込み\n"
 "書き込み要求は無視されます\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "書き込みブロック内の seek に失敗しました"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "書き込みエラー: ファイルの中 '%s' に不正ブロックがあります\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "スーパーブロック書込時のファイルシークに失敗しました"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "スーパーブロックを書き込めません"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "iノードマップを書き込めません"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "ゾーンマップを書き込めません"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "iノードを書き込めません"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "シークに失敗"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "マップバッファを確保できません"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "スーパーブロックを書き込めません"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "スーパーブロックに不正なマジックナンバーがあります"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Only 1k blocks/zones supported"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "bad s_imap_blocks field in super-block"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "bad s_zmap_blocks field in super-block"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "inode マップ用バッファの確保ができません"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "ゾーンマップ用バッファの確保ができません"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "inode 用バッファの確保ができません。"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "inode カウンタ用バッファの確保ができません。"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "ゾーンカウンタ用バッファの確保ができません。"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "inode マップが読込めません"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "ゾーンマップが読込めません"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "inode を読込めません"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "警告: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "iノード数 %ld\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "ブロック数 %ld\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zone サイズ=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "最大サイズ=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "ファイルシステム状態=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "名前の長さ=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "iノード %d は不使用マークされていますが、ファイル '%s' が利用しています\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "使用マーク"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "ファイル `%s' はモード %05o です\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "警告: inode 数が大きすぎます。\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "root inode がディレクトリではありません"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "ブロックは以前から利用されています。現在はファイル `%s' 内です。"
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "クリア"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "ファイル `%2$s' のブロック %1$d は未使用マークされています。"
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "正しい"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "ディレクトリ '%s' はファイル '%.*s' の不正 inode 番号を含みます。"
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " 削除"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: 不正なディレクトリ: '.' が最初ではありません\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: 不正なディレクトリ: '..' が 2 番目ではありません\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "内部エラー"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: 不正なディレクトリ: サイズが 32 未満"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "bad_zone での seek に失敗"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Inode %d のモードはクリアされず。"
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "inode %d は使われませんが、ビットマップでは使用マークが付いています"
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "inode %d が使用されますが、ビットマップでは不使用マークが付いています"
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "設定"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "inode %d (モード = %07o), i_nlinks=%d, counted=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks の値を count に設定しました"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zone %d: 利用マークが付いていますが、どのファイルも使っていません"
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "マークなし"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zone %d: 使用中、counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zone %d: 使用していません、counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "不正な inode サイズ"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "不正な v2 inode サイズ"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "対話的な修復を行なう為端末が必要です"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "'%s' を開けません: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s はクリーンです、チェックしません。\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "強制的に %s のファイルシステム検査します。\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "%s のファイルシステムは汚れており、検査が必要です。\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -904,12 +904,12 @@ msgstr ""
 "\n"
 "%6ld iノードが使用中 (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zone が使用中 (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -932,7 +932,7 @@ msgstr ""
 "------\n"
 "%6d ファイル\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1056,7 +1056,7 @@ msgstr "iノードが多すぎます - 最大 512 です"
 msgid "not enough space, need at least %llu blocks"
 msgstr "領域が不十分です。最低でも %llu ブロック必要です"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "デバイス: %s\n"
@@ -1230,10 +1230,8 @@ msgstr "%6.2f%% (%+ld バイト)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"ファイルクローズ中にエラー\n"
+msgid "cannot close file %s"
+msgstr "ファイル '%s' を開けません"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1340,88 +1338,98 @@ msgid ""
 "that some device files will be wrong."
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "使い方: %s [-c | -l ファイル名] [-nXX] [-iXX] /dev/name [ブロック数]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s はマウントされています -- ここにはファイルシステムをつくれません！"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "write_tables でのブートブロックへのシークに失敗しました"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "ブートセクタをクリアできません"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "write_tables でのシークに失敗しました"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "スーパーブロックを書き込めません"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "inode マップの書き込みができません"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "ゾーンマップの書き込みができません"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "inode の書き込みができません"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "書き込みブロック内の seek に失敗しました"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "write_block での書き込みに失敗しました"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "不正ブロックが多すぎます"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "正常なブロックが不十分です"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "マップバッファを確保できません"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "マップバッファを確保できません"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "inode バッファの確保ができません。"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "iノード数 %ld\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "ブロック数 %ld\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1430,97 +1438,97 @@ msgstr ""
 "最大サイズ=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "ブロックのテスト中にシークが失敗しました"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check に変な値があります: 多分バグでしょう\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "check_blocks でのシークに失敗しました"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "データ領域以前に不正ブロック: ファイルシステムを作成できません"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "不正ブロック数 %d\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "不正ブロック数 1\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "不正ブロックのファイルを開けません"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "不正ブロックファイルを読み込めません"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "不正な inode サイズ"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol エラー: ブロックの数が指定されませんでした"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat が失敗"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: open が失敗"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: デバイスを使用中です"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "ブロックサイズが %s の物理セクタサイズよりも小さい"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "%s のサイズを取得できません"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' 上にファイルシステムを作らないようにします"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "ブロックの数が少なすぎます"
@@ -1855,7 +1863,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "write_tables でのシークに失敗しました"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2199,7 +2207,7 @@ msgid "   Logical"
 msgstr "   論理"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "不明"
 
@@ -2856,12 +2864,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD ディスクラベルコマンド (m でヘルプ): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "最初 %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "終点 %s または +サイズ または +サイズM または +サイズK"
@@ -3007,7 +3015,7 @@ msgid "tracks/cylinder"
 msgstr "トラック/シリンダ"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "シリンダ数"
 
@@ -3075,12 +3083,12 @@ msgstr "最大パーティション数は作成済です\n"
 msgid "This partition already exists.\n"
 msgstr "このパーティションは既に存在します。\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "警告: パーティションが多すぎます (%d, 最大は %d)。\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3283,7 +3291,7 @@ msgstr "設定する必要があります"
 msgid "heads"
 msgstr "ヘッド数"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "セクタ数"
 
@@ -3714,7 +3722,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s ブート      始点        終点     ブロック   Id  システム\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "デバイス"
 
@@ -3798,7 +3806,7 @@ msgstr "合計確保済みセクタ %llu は最大値 %llu よりも大きいで
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld 未確保 %d バイトセクタが残っています\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "パーティション %d は定義済みです。まずは削除を行なってください。\n"
@@ -3954,37 +3962,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "ディスクを同期しています。\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "パーティション %d にはデータ領域がありません\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "新規データ開始位置"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "上級者コマンド (m でヘルプ): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "シリンダ数"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "ヘッド数"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "セクタ数"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "警告: DOS 互換のためのセクタオフセットを設定します\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3997,33 +4005,33 @@ msgstr ""
 "ユーティリティは GPT をサポートしません。GNU Parted を使ってください。\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "ディスク %s は正常なパーティションテーブルを含んでいません\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s を開けません\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s を開けません\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: 不明なコマンド\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "このカーネルはセクタサイズを自分認識します - -b オプションは無視します\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4032,17 +4040,17 @@ msgstr ""
 "警告: -b (セクタサイズ設定) オプションは 1 つのデバイス指定と共に\n"
 "使用されるべきです\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s でOSF/1 ディスクラベルを検出したので、ディスクラベルモードに移行します。\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "コマンド (m でヘルプ): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4051,16 +4059,16 @@ msgstr ""
 "\n"
 "現在のブートファイルは: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "新たなブートファイル名を入力してください: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "ブートファイルを変更しませんでした\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4380,9 +4388,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tあなたは、ブートファイル名として通常と異なる名前を選びました。\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "残念ながら、空ではない領域のタグを変更することになります。\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "残念ながら、システム時計の変更はスーパーユーザでしか行なえません。\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4398,7 +4406,7 @@ msgstr ""
 "だけが、このことを免れます。\n"
 "この領域に異なるタグ付けについて、よく解っているなら YES と入力して下さい。\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4591,7 +4599,7 @@ msgstr "未使用ギャップ -- 0-%d セクタ\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "未使用ギャップ -- %d-%d セクタ\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4600,7 +4608,7 @@ msgstr ""
 "他のパーティションが既にディスク全体を覆っています。\n"
 "まずそれを削除してからもう一度試してください。\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4609,12 +4617,12 @@ msgstr ""
 "11 番目の領域は entire disk を覆い、`SGI volume' 型であることを\n"
 "強く推奨します\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "セクタ %d は既に確保済みです\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4625,7 +4633,7 @@ msgstr ""
 "他のいくつかのパーティションを覆っています。あなたの項目は %d %s に\n"
 "変更されました。\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4635,7 +4643,7 @@ msgstr ""
 "Whole disk (5) のままにしておくことを考慮してください。\n"
 "0 から始まる %u セクタ分です\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4649,7 +4657,7 @@ msgstr ""
 "もし、あなたが本当にパーティションに符合 82 (Linux swap) をつけたければ\n"
 "YES と答えてください: "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4670,7 +4678,7 @@ msgstr ""
 "ユニット = %s of %d * 512 バイト\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4683,28 +4691,28 @@ msgstr ""
 "ユニット = %s of %d * 512 バイト\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s フラグ   始点      終点  ブロック   Id  システム\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "代替シリンダ数"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "シリンダ毎の特別なセクタ"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "インターリーブ"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "回転数 (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "物理シリンダ数"
 
@@ -5162,7 +5170,7 @@ msgstr "ディスク %s: ジオメトリを取得できません\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "ディスク %s: サイズを取得できません\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5174,22 +5182,22 @@ msgstr ""
 "ここに fdisk を利用するのは多分意味がないことです。\n"
 "[本当にこれを行ないたければ、--force オプションを使ってください]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "警告: HDIO_GETGEO によると、ヘッド数は %lu です\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "警告: HDIO_GETGEO によると、セクタ数は %lu です\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "警告: BLKGETSIZE/HDIO_GETGEO によると、シリンダ数は %lu です\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5199,7 +5207,7 @@ msgstr ""
 "これは、C/H/S をアドレス取得に利用している全てのソフトウェアで、\n"
 "問題が生ずることになります。\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5208,7 +5216,7 @@ msgstr ""
 "\n"
 "ディスク %s: シリンダ数 %lu、ヘッド数 %lu、%lu セクタ/トラック\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5216,7 +5224,7 @@ msgstr ""
 "パーティション %2$s のヘッド数として %1$s は不可能です: %3$lu (0-%4$lu にして"
 "ください)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5225,7 +5233,7 @@ msgstr ""
 "パーティション %2$s のセクタ数として %1$s は不可能です: %3$lu (1-%4$lu にして"
 "ください)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5234,7 +5242,7 @@ msgstr ""
 "パーティション %2$s のシリンダ数として %1$s は不可能です: %3$lu (0-%4$lu にし"
 "てください)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5243,12 +5251,12 @@ msgstr ""
 "Id  名前\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "パーティションテーブルを再読み込み中...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5258,26 +5266,26 @@ msgstr ""
 "mkfs を使う前に、partprobe(8) か kpartx(8) を実行するか、\n"
 "システムを再起動してください\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s のクローズエラー\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: そのようなパーティションはありません\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "認識できないフォーマット -- セクタ数を利用します\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "未実装のフォーマット -- %s を利用します\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5286,12 +5294,12 @@ msgstr ""
 "ユニット = %lu バイトのシリンダ、1024 バイトのブロック、%d から数えます\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "デバイス ブート 始点    終点 #シリンダ #ブロック  Id  システム\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5300,12 +5308,12 @@ msgstr ""
 "ユニット = 512 バイトのセクタ、%d から数えます\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "デバイス ブート    始点      終点    #セクタ  Id システム\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5314,12 +5322,12 @@ msgstr ""
 "ユニット = 1024 バイトのブロック、%d から数えます\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr " デバイス ブート 始点        終点  #ブロック ID  システム\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5328,31 +5336,31 @@ msgstr ""
 "Units = 1048576 バイトをメガバイト、1024 バイトのブロック、%d から数えます\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "デバイス ブート 始点   終点   MiB  #ブロック   Id  システム\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t開始: (c,h,s) 期待値 (%ld,%ld,%ld)  (%ld,%ld,%ld) を発見\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t終点: (c,h,s) 期待値 (%ld,%ld,%ld)  (%ld,%ld,%ld) を発見\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "シリンダ %ld にパーティションの終点、ディスクの最後を越えています\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "パーティションが見つかりません\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5363,52 +5371,42 @@ msgstr ""
 "  (%ld/%ld/%ld のかわりに)。\n"
 "このリストは、そのジオメトリと見なします。\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "現在パーティション情報はありません。\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "変です、%d つのパーティションしか定義されていません。\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "警告: パーティション %s はサイズ 0 ですが、空としてマークされていません\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "警告: パーティション %s はサイズ 0 なのにブート可能です。\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "警告: パーティション %s はサイズ 0 で、非ゼロの開始位置です\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "警告: パーティション %s は、"
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
-msgstr "パーティション %s に含まれていません\n"
-
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "警告: パーティション %s "
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
+msgstr "警告: パーティション %s が"
 
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "と %s が重なっています\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "警告: パーティション %d は空です\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5418,17 +5416,17 @@ msgstr ""
 "おり、\n"
 "それが埋められる時点で破壊される事になります\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "警告: パーティション %s がセクタ 0 から始まっています\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "警告: パーティション %s はディスクの終りを越えています\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5436,17 +5434,17 @@ msgstr ""
 "基本パーティションでは、拡張パーティションを一つだけ作れます\n"
 " （Linux では問題とはなりませんけれども）\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "警告: パーティション %s はシリンダ境界から始まっていません\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "警告: パーティション %s はシリンダ境界で終わっていません\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5455,7 +5453,7 @@ msgstr ""
 "LILO にとっては問題ありませんが、DOS の MBR はこのディスクをブートできなく\n"
 "なってしまいます。\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5463,7 +5461,7 @@ msgstr ""
 "警告: 普通は基本パーティションの一つをブートできるようにします。\n"
 "LILO は `ブート可能' フラグを無視しますけども。\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5472,35 +5470,35 @@ msgstr ""
 "LILO にとっては問題ありませんが、DOS MBR はこのディスクをブートできなく\n"
 "なってしまいます。\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "開始"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "パーティション %s: 始点: (c,h,s) 期待値 (%ld,%ld,%ld)  (%ld,%ld,%ld) を発見\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "終了"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "パーティション %s: 終点: (c,h,s) 期待値 (%ld,%ld,%ld)  (%ld,%ld,%ld) を発見\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 "シリンダ %2$ld にあるパーティション %1$s の終点はディスクの最後を越えていま"
 "す\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5509,7 +5507,7 @@ msgstr ""
 "警告: 拡張領域の開始位置が %ld から %ld に移されました\n"
 "（リスト表示の為だけです。その内容に変更はありません。）\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5517,132 +5515,132 @@ msgstr ""
 "警告: 拡張領域がシリンダ境界から始まっていません\n"
 "DOS と Linux は中身を異なって解釈するでしょう。\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "パーティションが多すぎます -- nr (%d) 以降を無視します\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "パーティションのツリー？\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager を検出 -- これを捕捉できません\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 署名を発見 -- 諦めます\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "変です..., サイズ 0 の拡張パーティション ？\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "変です..., サイズ 0 の BSD パーティション？\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: 認識できないパーティション領域タイプ\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n フラグが与えられました: 何も変更しませんでした\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "古いセクタの保存に失敗 -- 中断します\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "長いか不完全な行の入力 -- 中止します\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "入力エラー: `=' は %s フィールドの後にしてください\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "入力エラー: %2$s フィールドの後の予期しない文字 `%1$c'\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "認識できない入力: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "数字が大きすぎます\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "数字の後ろにゴミが付いています\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "パーティション記述子の空きがありません\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "拡張パーティションの囲いを構築できません\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "入力フィールドが多すぎます\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "これ以上の空きがありません\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "不正なタイプ\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "警告: 与えられたサイズ (%lu) は、許容できる最大サイズ (%lu) を越えています\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "警告: 空のパーティション\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "警告: 不正なパーティションが始まっています (一番最初 %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "認識できないブート可能フラグ -- - か * を選んでください\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s の一部を指定？\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "拡張パーティションが予期した場所にありません\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "不正な入力\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "パーティションが多すぎます\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5653,100 +5651,181 @@ msgstr ""
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "普通は <start> と <size> (そして恐らく <type>)を指定するだけで構いません。\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "使い方: %s [オプション] デバイス名...\n"
+msgstr "使い方:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "デバイス: /dev/hda や /dev/sda の様な何か"
+msgid " %s [options] <device> [...]\n"
+msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"オブション:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "危険なオプション:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [or --show-pt-geometry]: 領域テーブルから推測されるジオメトリ情報を表"
+"示する"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [or --show-extended]: 拡張領域リストも表示する\n"
+"                             またはそれらの記述子の入力を得る"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "使い方:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s デバイス\t\t デバイス上のアクティブ領域をリストします\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s デバイス n1 n2 ... n1 をアクティブにして..., 残りを非アクティブにします\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An デバイス\t n をアクティヴにし、それ以外を非アクティブにします\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5759,62 +5838,62 @@ msgstr ""
 "ユーティリティ GPT をサポートしていません。GNU Parted を利用してください。\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "全てのチェックを超越させるには --force フラグを使ってください。\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "コマンドなし？\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "合計: %llu ブロック\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "使い方: sfdisk --print-id デバイス パーティション番号\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "使い方: sfdisk --change-id デバイス パーティション番号 ID\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "使い方: sfdisk --id デバイス パーティション番号 [ID]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "一つのデバイスのみ指定できます (-l や -s を除く)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s を読み書きモードで開けません\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s を読込み用に開けません\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: シリンダ数 %ld、ヘッド数 %ld、%ld セクタ/トラック\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s のサイズを取得できません\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "不正なブートフラグ: 0x80 でなく 0x%x です\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5822,7 +5901,7 @@ msgstr ""
 "終了\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5832,35 +5911,35 @@ msgstr ""
 "LILO では問題ありませんが、DOS MBR は 1 つのアクティブなパーティションしか\n"
 "ブートできません。\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "パーティション %s には ID %x があり、隠されていません\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "不正な ID %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "このディスクは現在使用中です。\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "致命的なエラー: %s が見つかりません\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "警告: %s はブロックデバイスではありません\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "現在、誰もこのディスクを使っていないかを調べます...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5874,30 +5953,30 @@ msgstr ""
 "   があれば swapoff してください。\n"
 "   ちなみに --no-reread フラグでこのチェックを抑制できます。\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "全てのチェックを超越させるには --force フラグを使ってください。\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "古い場面:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "パーティション %d は存在しませんので、変更できません\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "新たな場面:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5905,21 +5984,21 @@ msgstr ""
 "私はこれらのパーティションに関与したくありません -- 変更しません。\n"
 "(本当にこれを行ないたければ、--force オプションを使ってください)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "私はこれに関与したくありません -- 恐らく No と答えるべきでしょう\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "これであなたの要求は満たされますか？ [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "ディスクへの書き込みを行ないますか？ [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5928,16 +6007,16 @@ msgstr ""
 "\n"
 "sfdisk: 入力が短すぎます\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "中断 -- 何も変更しません\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "y,n,q のいずれかで答えてください\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5946,7 +6025,7 @@ msgstr ""
 "新たなパーティションの書き込みに成功\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5978,101 +6057,103 @@ msgstr "ディスクを同期しています。\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s が成功しました。\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s は失敗しました。\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "警告: %s を開けません: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: 見つかりません\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s: wait: 子プロセスは存在しない?!?\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s への書き込みエラー: %s"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: 存在しないデバイスをスキップしています\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck: %sをチェックできません: fsck.%sは見つかりません\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "すべてのファイルシステム検査します。\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--待機中-- (パス %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6080,58 +6161,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: デバイスが多すぎます\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "%s をオープンできません\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "/proc はマウントされていますか?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "一致するファイルシステムが見つかりません: %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "一致するファイルシステムが見つかりません: %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: 引数が多すぎます\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6150,33 +6231,78 @@ msgstr "-l や --long 引数の後のロングオプションが空です"
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s か --shell 引数の後のシェルを知りません"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+"       getopt [オプション] -o|--options オプション文字列 [オプション] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            ロングオプションが - 一つで始まるのを許す\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   このちょっとした使い方を表示する\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=longopts   ロングオプションを理解させる\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=progname          エラー報告の際の名前\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=optstring      ショーとオプションを理解させる\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  getopt(3) のエラー報告を行わない\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           通常の出力を行わない\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=shell            シェルの引用取り決めを設定する\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   getopt(1) バージョンをテストする\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 出力を引用しない\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                バージョン情報を出力する\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "オプション文字列引数が足りません"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "内部エラー、作者に連絡を。"
 
@@ -6625,91 +6751,109 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "カーネルにエポック値を設定することができませんでした。\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"オブション:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "                あなたの alpha のタイプを指示する (hwclock(8) 参照)\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "システムクロックを設定できません。\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "pid の解析に失敗しました"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s は何らかのオプション引数を取ります。あなたは %d 個与えました。\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6718,7 +6862,7 @@ msgstr ""
 "あなたは機能オプションを複数個指定しました。\n"
 "一度に一つの機能のみ行なうことができます。\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6727,7 +6871,7 @@ msgstr ""
 "%s: --utc と --localtime オプションは相互排他的ですが、両方が指定されまし"
 "た。\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6736,7 +6880,7 @@ msgstr ""
 "%s: --adjust と --noadjfile オプションは相互排他的ですが、両方が指定されまし"
 "た。\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6745,30 +6889,30 @@ msgstr ""
 "%s: --adjfile と --noadjfile オプションは相互排他的ですが、両方が指定されまし"
 "た。\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: --noadjfile をつけた場合、--utc か --localtime のいずれかを指定しなければ"
 "なりません\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "有効な設定時刻がありません。クロックを設定できません。\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr ""
 "残念ながら、ハードウェアク時計の変更はスーパーユーザでしか行なえません。\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "残念ながら、システム時計の変更はスーパーユーザでしか行なえません。\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6776,12 +6920,12 @@ msgstr ""
 "残念ながら、カーネル内のハードウェア時計のエポック値を変更できるのは、\n"
 "スーパーユーザだけです。\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "既知のどんな方法でも、ハードウェア時計にアクセスできません。\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -6963,7 +7107,7 @@ msgid "failed to read mtab"
 msgstr "stat が失敗しました: %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "出力バッファの確保に失敗しました"
@@ -7011,45 +7155,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7059,27 +7243,27 @@ msgstr ""
 "詳細情報は、ipcmk(1) を確認してください。\n"
 "\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: マウントに失敗しました"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "pid の解析に失敗しました"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "pid %d の属性の取得に失敗しました"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "出力バッファの確保に失敗しました"
@@ -7167,7 +7351,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: PAM 失敗。中断します: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "パスワード: "
 
@@ -7613,47 +7797,48 @@ msgstr "過大な行送り(linefeed)"
 msgid "too many bare linefeeds."
 msgstr "行送り(linefeed) が多すぎます。\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "%d 秒後にログインの時間切れ\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "最終ログイン: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr " %.*s から\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr " %.*s 上\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "標準出力への書き込みが失敗しました"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s からのログインが失敗, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s でのログインが失敗, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d 回 %s からのログインが失敗, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d 回 %s でのログインが失敗, %s"
@@ -7683,7 +7868,7 @@ msgstr "mount: 許可がありません"
 msgid "setuid failed"
 msgstr "setuid() に失敗"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "exec %s に失敗"
@@ -7728,8 +7913,8 @@ msgstr "%s: %s のコンテキストを設定できません"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: %s のロックを解除できません: %s (変更は %s のままです)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "子プロセスの起動に失敗"
 
@@ -7781,24 +7966,21 @@ msgstr "不正な年: 1-9999 を使ってください"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "使い方: cal [-13smjyV] [[[日] 月] 年]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7910,32 +8092,32 @@ msgstr " 削除"
 msgid "failed to add line to output"
 msgstr "出力バッファの確保に失敗しました"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "解析エラー\n"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "出力バッファの確保に失敗しました"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "読み込むことができません: %s"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "出力バッファの確保に失敗しました"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc() が失敗しました"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7952,49 +8134,74 @@ msgstr ""
 " %1$s [オプション] <device> <mountpoint>\n"
 " %1$s [オプション] [--source <device>] [--target <mountpoint>]\n"
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "利用可能コマンド:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8003,42 +8210,42 @@ msgstr ""
 "\n"
 "詳細情報は、namei(1) を確認してください。\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "不明なリソースタイプ: %s\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "pid の解析に失敗しました"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "出力バッファの確保に失敗しました"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "出力バッファの確保に失敗しました"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "出力バッファの確保に失敗しました"
@@ -8063,12 +8270,12 @@ msgstr "%s: プロセス \"%s\" を見つけられません\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: 不明なシグナル %s -- 正常なシグナル:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "使い方: %s [ -s シグナル | -p ] [ -a ] プロセスID ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "        %s -l [ シグナル ]\n"
@@ -8088,85 +8295,84 @@ msgstr "ソケット: %s.\n"
 msgid "connect %s"
 msgstr "connect: %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "ソケット"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "接続"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "使い方: %s [オプション]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(次のファイル: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "値 `%s' は `%s' にとって範囲外です\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: 不明な要素名: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: 不明な優先度: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8306,7 +8512,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: open に失敗: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8324,12 +8530,13 @@ msgstr "%s: open に失敗: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: open に失敗: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8337,7 +8544,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8360,7 +8567,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8369,33 +8576,33 @@ msgstr ""
 "\n"
 "詳細情報は、wipefs(8) を確認してください。\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "使い方: %s [オプション]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "%s をオープンできません\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%2$s から %1$d バイト取得しました\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "exec %s に失敗"
@@ -8415,26 +8622,14 @@ msgstr "'%s' を stat できません"
 msgid "%s - No such file or directory\n"
 msgstr "%s: ファイルディスクリプタかファイルかディレクトリを必要とします\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "使い方: %s [オプション] パス名 [パス名 ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"オブション:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8446,8 +8641,7 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8455,12 +8649,12 @@ msgstr ""
 "\n"
 "詳細情報は、namei(1) を確認してください。\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date 引数が長すぎます\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8470,167 +8664,162 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: %s から %s への名前の変更に失敗しました: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "不正な引数"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "書き込み"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "%c を読込み\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "正しくないレスポンス長"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s を開くまたは作成できません: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "lock %s が失敗しました: %s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "uuidd デーモンは既にに pid %s で実行中です\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "unixストリームソケットを作成できませんでした: %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "unixソケット %sをバインドできません: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s を開けません: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "%s の読込みエラー\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "不正なオプション"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "生成されたランダムなUUID: %s\n"
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
 
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "生成された %d UUID:\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "生成された %d UUID:\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "不正なオプション %d\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "不正な数: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "%s のモード変更エラー: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "UUIDのリスト:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "pid %d で実行中の uuidd を強制終了できません: %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "pid %d で実行中の uuidd を強制終了しました\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8638,29 +8827,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8694,31 +8882,32 @@ msgstr "%s: write が失敗"
 
 #: misc-utils/wipefs.c:240
 #, c-format
-msgid "%zd bytes ["
-msgstr "%zd バイト ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "不正なオフセット値: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "使い方: %s [オプション] デバイス名...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8727,11 +8916,11 @@ msgstr ""
 "\n"
 "詳細情報は、wipefs(8) を確認してください。\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8823,63 +9012,63 @@ msgstr "%s のオーナー変更エラー: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s の名前を %s に変更できません: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: /dev ディレクトリは存在しません。"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: デバイス %s のキャパシティを設定できません: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", sizelimit %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", 暗号 %s (タイプ %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", オフセット %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", 暗号タイプ %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: デバイス %s の情報を取得できません: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: デバイス %s をオープンできません: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: dev/loop%s<N> を見るための権限がありません"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: 空いている loop デバイスが見つかりません"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8889,57 +9078,55 @@ msgstr ""
 "いないかもしれません。\n"
 "       (そうであれば、再コンパイルするか `modprobe loop.o' して下さい。)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "パスフレーズの読み込み中にメモリが足りなくなりました"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "警告: %s は既に %s に関連づけされています\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "警告: %s: は書き込み禁止です、読込み専用でマウントします\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "メモリに格納できませんでしたので、終了します。\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD 失敗: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): 成功\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): 成功\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: デバイス %s を削除できません: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "この mount は loop のサポートなしでコンパイルされました。\n"
 "再コンパイルしてください。\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8947,7 +9134,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "使い方:\n"
@@ -8960,19 +9147,17 @@ msgstr ""
 "                                              一覧を表示\n"
 " %1$s [オプション] {-f|--find|loopdev} <ファイル> セットアップ\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -8988,32 +9173,32 @@ msgstr ""
 " -v | --verbose           verbose mode\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "不正な設定値: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "不正な設定値: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Loopデバイス は %s です\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: デバイスを使用中です"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9579,14 +9764,17 @@ msgstr "xstrndup 呼び出しのバグ"
 msgid "not enough memory"
 msgstr "メモリが不十分です"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "The <special> parameter:\n"
@@ -9596,166 +9784,151 @@ msgstr ""
 " <file>                               使用するファイルの名前\n"
 "\n"
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "使い方: %s [オプション] デバイス名...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"使い方:\n"
-" %1$s -a [-e] [-v]                  /etc/fstab 内で指定したスワップを有効にす"
-"る\n"
-" %1$s [-p priority] [-v] [-f] <special>  指定されたスワップを有効にする\n"
-" %1$s -s                            スワップの使用状況を表示\n"
-" %1$s -h                            ヘルプの表示\n"
-" %1$s -V                            バージョンの表示\n"
-"\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"使い方:\n"
-" %1$s -a [-v]                      すべてのスワップを無効にする\n"
-" %1$s [-v] <special>               指定されたスワップを無効にする\n"
-" %1$s -h                           ヘルプの表示\n"
-" %1$s -V                           バージョンの表示\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: 予期しないファイル形式"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: スワップを再初期化しています。"
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "実行に失敗"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "waitpid に失敗"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: シークに失敗"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: 署名の書き込みに失敗"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "異なる"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "同じ"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: 安全でない権限 %04o を持ちます。 %04o がお勧めです。"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: 安全でない権限 %04o を持ちます。 %04o がお勧めです。"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: ファイル %s をスキップ -- ホールを検出。\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: サイズの取得に失敗"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: スワップヘッダの読み込みに失敗しました"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s: ソフトウェアサスペンドデータを検出しました。スワップ署名を書きなおしま"
 "す。"
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%2$s に %1$s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s swaponは失敗しました"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "%s 用のデバイスが見つかりません"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "スーパーユーザーではありません"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoffは失敗しました"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10034,7 +10207,7 @@ msgstr "警告: %d 以降の領域を削除します\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "警告: %d 以降の領域を削除します\n"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10094,19 +10267,13 @@ msgstr "        (%s パーティションテーブルを認識しました)。"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "ディスク %s は正常なパーティションテーブルを含んでいません\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10117,21 +10284,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "利用可能コマンド:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10140,26 +10306,26 @@ msgstr ""
 "\n"
 "詳細情報は、setarch(8) を確認してください。\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "出力バッファの確保に失敗しました"
@@ -10287,7 +10453,7 @@ msgstr "%s のパーティション書き込みに失敗\n"
 msgid "failed to set pid %d's policy"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "typescript ファイル %s の読み込みが失敗しました"
@@ -10559,7 +10725,7 @@ msgstr "%s: デフォルト閾値 %ld 及びデフォルトタイムアウト %l
 msgid "Can't set signal handler"
 msgstr "シグナルハンドラを設定できません"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday が失敗"
 
@@ -10568,7 +10734,7 @@ msgstr "gettimeofday が失敗"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "%s で CYGETMON が発行できません: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10576,12 +10742,12 @@ msgstr ""
 "%s: 整数 %lu、キャラクタ %lu/%lu -- fifo: 閾値 %lu、タイムアウト %lu、\n"
 "    最大 %lu、現在 %lu\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f 整数/秒; %f 記録, %f 送信 (キャラクタ/秒)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10589,7 +10755,7 @@ msgstr ""
 "%s: 整数 %lu、キャラクタ %lu -- fifo: しきい値 %lu、タイムアウト %lu、\n"
 "    最大 %lu、現在 %lu\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f 整数/秒 -- %f 記録 (キャラクタ/秒)\n"
@@ -10681,130 +10847,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "%s を open できません"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"使い方: %s [オプション]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: open に失敗: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "不明なカラム: %s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: open に失敗: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "不明なリソースタイプ: %s\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync に失敗"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "書き込みに失敗しました: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: open に失敗: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "コマンドなし？\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctlが失敗"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"使い方: %s [オプション] <ファイル名>\n"
-"\n"
-"オプション:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10812,7 +10955,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10821,36 +10964,36 @@ msgstr ""
 "\n"
 "詳細情報は、namei(1) を確認してください。\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "引数が十分ではありません"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "不正な設定値: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "不正な設定値: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "--date オプションが指定されていません。\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "%sで予期しないファイルの終端"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate が失敗"
@@ -10858,18 +11001,24 @@ msgstr "%s: fallocate が失敗"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "使い方: %1$s [-sxun][-w #] fd#\n"
 "        %1$s [-sxon][-w #] ファイル [-c] command...\n"
@@ -10885,52 +11034,48 @@ msgstr ""
 "  -h  --help       このテキストを表示する\n"
 "  -V  --version    バージョンを表示する\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s は引数を要求します\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: ロックファイル %s を開けません: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: 不正な数値: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s: ファイルディスクリプタかファイルかディレクトリを必要とします\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: 子プロセスの起動に失敗: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "使い方: %s [オプション] <ファイル名>\n"
 "\n"
 "オプション:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -10938,38 +11083,37 @@ msgstr ""
 "\n"
 "詳細情報は、wipefs(8) を確認してください。\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "--date オプションが指定されていません。\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "--date オプションが指定されていません。\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s: stat が失敗"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "root inode がディレクトリではありません "
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "%s: write が失敗"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s: write が失敗"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10978,8 +11122,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -10987,95 +11131,83 @@ msgstr ""
 "\n"
 "詳細情報は、namei(1) を確認してください。\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: open に失敗: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: open に失敗: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "%s から時刻を読込むための ioctl() に失敗しました"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "--date オプションが指定されていません。\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "root inode がディレクトリではありません "
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: write が失敗"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:84
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
-"\n"
-"使い方: %s [オプション]\n"
-"\n"
 
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "詳細情報は、ipcmk(1) を確認してください。\n"
 "\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "共有メモリの作成に失敗しました"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "共有メモリid: %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "メッセージキューid: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "セマフォの作成に失敗しました"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "セマフォid: %d\n"
@@ -11574,8 +11706,8 @@ msgstr ""
 "シェアードメモリセグメント shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11584,8 +11716,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "モード=%#o\tアクセス権=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11617,8 +11749,8 @@ msgstr ""
 "メッセージキュー msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11650,8 +11782,8 @@ msgstr ""
 "セマフォ配列 semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11699,73 +11831,71 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "不正な id: %s\n"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "使い方: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> "
 "<device>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "不正な速度: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s from %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "不正なオプション"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "不正な id: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s はシリアルラインではありません"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s のサイズを取得できません"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "速度 %d はサポートされません"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "%s の端末属性を設定できません"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "ディスクドライブ上で seek できません"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s を open できません"
@@ -11920,15 +12050,14 @@ msgstr "%s キャッシュ:"
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMAノード %d CPU:"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "CPU アーキテクチャ情報ヘルパー\n"
 "\n"
@@ -11937,26 +12066,22 @@ msgstr ""
 "る。\n"
 "  -s, --sysroot  新しいシステムルートとしてこのディレクトリを使う。\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11966,12 +12091,12 @@ msgstr ""
 "詳細情報は、ipcmk(1) を確認してください。\n"
 "\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "root inode がディレクトリではありません "
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s はマウントされています\t "
@@ -12007,45 +12132,43 @@ msgstr ""
 "\t -n                  バイトオーダの自動検知を無効化する\n"
 "\t -V                  バージョン情報を表示して終了する\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: %s への書き込みエラー: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "サンプリングステップ: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): 間違ったマップ行\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: %s に \"_stext\" が見つかりません\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: プロファイルアドレスが範囲外です。間違った map ファイル?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "合計"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12060,10 +12183,7 @@ msgstr ""
 "\n"
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12072,8 +12192,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12081,72 +12201,61 @@ msgstr ""
 "\n"
 "詳細情報は、namei(1) を確認してください。\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice from %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "不明なカラム: %s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "不正なタイムアウト値: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "ユーザ"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "%s のパーティション書き込みに失敗\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: 古い優先度は %d、新たな優先度は %d です\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"使い方: %s [オプション] <ファイル名>\n"
-"\n"
-"オプション:\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "使い方: %s [オプション]\n"
 "    -d | --device <デバイス>  rtc デバイスを選択する (rtc0|rtc1|...)\n"
@@ -12159,8 +12268,8 @@ msgstr ""
 "    -v | --verbose            メッセージを表示する\n"
 "    -V | --version            バージョンを表示する\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12168,161 +12277,161 @@ msgstr ""
 "\n"
 "詳細情報は、taskset(1) を確認してください。\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "rtcの時間を読み込みます"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "システムタイプを読み込みます"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "rtc時間を変換する"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "rtcのアラームを設定します"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "rtcアラームを有効にする"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "rtcのアラームを設定します"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "rtcアラームを有効にする"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "rtc時間を変換する"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "%s: 認識できないサスペンド状態 '%s'\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: open に失敗: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "pid の解析に失敗しました"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC 時間を使います。\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "ローカル時間を使います。\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s は lp デバイスではありません。\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "メッセージ from %s@%s on %s at %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "typescript ファイル %s の読み込みが失敗しました"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "読み込みに失敗しました: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 #, fuzzy
 msgid "disable rtc alarm interrupt failed"
 msgstr "rtcアラームの割り込みを無効にする"
@@ -12381,16 +12490,16 @@ msgstr ""
 "%s: %s\n"
 "詳細情報を得るには、`%s --help' を実行して下さい。\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: 認識できないアーキテクチャ"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "引数が十分ではありません"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "%s のパーティション書き込みに失敗\n"
@@ -12473,24 +12582,21 @@ msgstr "%s は IRQ %d を使います\n"
 msgid "%s using polling\n"
 msgstr "%s はポーリングを行います\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "使い方: %s [オプション] <プログラム> [引数 ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12498,147 +12604,147 @@ msgstr ""
 "\n"
 "詳細情報は、unshare(1) を確認してください。\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshareに失敗"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "グループid を設定できません"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "ユーザーid を設定できません"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: %s を実行できません: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "エラー: %sへ作業ディレクトリを変更する。 "
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: プロセス \"%s\" を見つけられません\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: %s を実行できません: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "出力バッファの確保に失敗しました"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "不正なタイムアウト値: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "引数が十分ではありません"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "出力バッファの確保に失敗しました"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "不正な速度: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "代替速度が多すぎます"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: 標準入力として開くことができません: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: キャラクタデバイスではありません"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: 読み書き両用にオープンできません"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: 複製に問題発生: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "タイプ: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: read: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: 入力が溢れました"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12650,72 +12756,66 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "ユーザ"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "ユーザ"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "使い方: %s [オプション]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "unshareに失敗"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "stat が失敗: %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "は y です\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "は n です\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "セマフォの作成に失敗しました"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "不正な id: %s\n"
@@ -12731,52 +12831,46 @@ msgstr ""
 "本当にそれを使いたいなら `%s [オプション] %s' を使いましょう\n"
 "Script は開始しませんでした。\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "ファイル '%s' を開けません"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "スクリプトを開始しました、ファイルは %s です\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "スクリプトは %s に開始しました"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: スクリプトファイルを書き込むことが出来ません。エラー: %s \n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12785,79 +12879,76 @@ msgstr ""
 "\n"
 "スクリプトは %s に終了しました"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "スクリプトを終了しました、ファイルは %s です\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty が失敗\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "利用できる pty がありません\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <timingfile> [<typescript> [<divisor>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "標準出力への書き込みが失敗しました"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "%sで予期しないファイルの終端"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "typescript ファイル %s の読み込みが失敗しました"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "%sで予期しないファイルの終端"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "typescript ファイル %s を開けません"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "%s から時刻を読込むための ioctl() に失敗しました"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: 予期しないファイル形式"
@@ -12868,50 +12959,47 @@ msgid "Argument error."
 msgstr "%s: 引数エラー、使い方は\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12920,61 +13008,61 @@ msgstr ""
 "\n"
 "詳細情報は、wipefs(8) を確認してください。\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "子プロセスを起動できません"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "子プロセスを起動できません"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "%s を%sでオープンできません\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "パワーセーブモードに設定(又は解除)できません\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "デバイス %s を書き込みようにオープンできません\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl エラー: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "スクリーンダンプ書き込みエラー\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "%s を読み込むことができません\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM が定義されていません。\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: 不明なシグナル %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13002,144 +13090,149 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "使い方: %s [オプション] デバイス名...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "不正なオプション"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "不正なタイムアウト値: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: 一時ファイルをオープンできません。\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "ユーザーid を設定できません"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "ディスクサイズを取得できません"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "%s@%s から流れてきたメッセージ"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: %s を読みません - 標準入力を使いましょう。\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s: stat が失敗"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "読み込みに失敗しました: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "使い方: %s [オプション] パス名 [パス名 ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: あなたの tty の名前を見つけられません\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: あなたは書き込み権限をオフにしたままです。\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s は %s にログインしていません。\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write %s は %s ではメッセージを無効にしています\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write %s はログインしていません\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s はメッセージを無効にしています\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s は複数ログインしています -- %s に write します\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "入力行が長すぎます。\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "メッセージ from %s@%s (%s として) on %s at %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "メッセージ from %s@%s on %s at %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc が失敗しました"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"使い方: %s [オプション]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13324,7 +13417,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13500,7 +13593,7 @@ msgstr ""
 "\n"
 "パターンが見つかりません\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "パターンが見つかりません"
 
@@ -13566,7 +13659,7 @@ msgstr "hexdump: 不正な書式 {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: 不正な変換キャラクタ %%%s。\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13594,7 +13687,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13602,84 +13695,84 @@ msgstr ""
 "%s: 使い方: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [ファイ"
 "ル]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: オプションは引数を要求します -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: 不正なオプション -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...飛ばしています\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...飛ばしています\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "次のファイルはありません"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 #, fuzzy
 msgid "No previous file"
 msgstr "領域が定義されていません\n"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s で read エラー\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: ファイル%sで予期しないファイルの終端\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s で seek エラー\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: 一時ファイルを作成できません\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE エラー"
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "開けません"
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "保存しました"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !commandはrflagモードでは許可されません。\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() が失敗しました、後で実行し直してください\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(次のファイル: "
 
@@ -13750,8 +13843,8 @@ msgstr "使い方: %s [オプション] デバイス名...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13767,39 +13860,152 @@ msgstr "%s: open に失敗: %s\n"
 msgid "no input file specified"
 msgstr "--date オプションが指定されていません。\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "使い方: %s [オプション] デバイス名...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "terminfo の読み込み中にトラブル発生"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "不明なエスケープシーケンスが入力されました: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "入力行が長すぎます。\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "使い方:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "ファイルクローズ中にエラー\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "残念ながら、空ではない領域のタグを変更することになります。\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "警告: パーティション %s は、"
+
+#~ msgid "is not contained in partition %s\n"
+#~ msgstr "パーティション %s に含まれていません\n"
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "警告: パーティション %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "と %s が重なっています\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "使い方: %s [オプション] デバイス名...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "デバイス: /dev/hda や /dev/sda の様な何か"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd バイト ["
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "使い方:\n"
+#~ " %1$s -a [-e] [-v]                  /etc/fstab 内で指定したスワップを有効"
+#~ "にする\n"
+#~ " %1$s [-p priority] [-v] [-f] <special>  指定されたスワップを有効にする\n"
+#~ " %1$s -s                            スワップの使用状況を表示\n"
+#~ " %1$s -h                            ヘルプの表示\n"
+#~ " %1$s -V                            バージョンの表示\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "使い方:\n"
+#~ " %1$s -a [-v]                      すべてのスワップを無効にする\n"
+#~ " %1$s [-v] <special>               指定されたスワップを無効にする\n"
+#~ " %1$s -h                           ヘルプの表示\n"
+#~ " %1$s -V                           バージョンの表示\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "使い方: %s [オプション] <ファイル名>\n"
+#~ "\n"
+#~ "オプション:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "使い方: %s [オプション]\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "使い方: %s [オプション] <ファイル名>\n"
+#~ "\n"
+#~ "オプション:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "使い方: %s [オプション] デバイス名...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13940,27 +14146,10 @@ msgstr "入力行が長すぎます。\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [or --help]:      このメッセージを表示する"
 
-#~ msgid "dangerous options:"
-#~ msgstr "危険なオプション:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g [or --show-geometry]: カーネルのジオメトリ情報を表示する"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [or --show-pt-geometry]: 領域テーブルから推測されるジオメトリ情報を"
-#~ "表示する"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [or --show-extended]: 拡張領域リストも表示する\n"
-#~ "                             またはそれらの記述子の入力を得る"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr "    -L  [or --Linux]:      Linux にそぐわなくても文句を云わない"
@@ -14015,51 +14204,9 @@ msgstr "入力行が長すぎます。\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [オプション] [--] オプション文字列 値\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [オプション] -o|--options オプション文字列 [オプション] "
-#~ "[--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              値\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            ロングオプションが - 一つで始まるのを許す\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   このちょっとした使い方を表示する\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=longopts   ロングオプションを理解させる\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr "  -n, --name=progname          エラー報告の際の名前\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=optstring      ショーとオプションを理解させる\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr "  -q, --quiet                  getopt(3) のエラー報告を行わない\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           通常の出力を行わない\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr "  -s, --shell=shell            シェルの引用取り決めを設定する\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   getopt(1) バージョンをテストする\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 出力を引用しない\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                バージョン情報を出力する\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (enhanced) 1.1.4\n"
 
@@ -15529,9 +15676,6 @@ msgstr "入力行が長すぎます。\n"
 #~ msgid "BSD/386"
 #~ msgstr "BSD/386"
 
-#~ msgid "Warning: partition %s contains part of "
-#~ msgstr "警告: パーティション %s が"
-
 #~ msgid "and will destroy it when filled\n"
 #~ msgstr "これを行うと、破壊されてしまうことになるでしょう\n"
 
diff --git a/po/nl.po b/po/nl.po
index e57044932..d0861c146 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -17,8 +17,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-2.19-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2011-01-30 21:35+0100\n"
 "Last-Translator: Benno Schulenberg <benno@vertaalt.nl>\n"
 "Language-Team: Dutch <vertaling@vrijschrift.org>\n"
@@ -114,29 +114,29 @@ msgstr "partitietabel opnieuw inlezen"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "grootte in 512-byte sectoren tonen"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "kan %s niet openen"
@@ -218,7 +218,7 @@ msgid "Verifying ... "
 msgstr "Controleren... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Kan bestand '%s' niet openen"
@@ -258,15 +258,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -279,7 +279,7 @@ msgstr "'%s' uit %s\n"
 msgid "cannot stat file %s"
 msgstr "kan apparaat %s niet vinden"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, c-format
 msgid "%s: not a block device"
@@ -329,8 +329,8 @@ msgid "stat failed: %s"
 msgstr "status opvragen is mislukt: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "openen is mislukt: %s"
@@ -556,55 +556,55 @@ msgstr "ongeldige positie van bestandsgegevens"
 msgid "compiled without -x support"
 msgstr "gecompileerd zonder ondersteuning voor '-x'"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Gebruik:  %s [-larvsmf] /dev/naam\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s is aangekoppeld.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Wilt u echt doorgaan"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "De controle is afgebroken.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zonenummer < EERSTEZONE in bestand '%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zonenummer >= ZONES in bestand '%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Blok verwijderen"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Leesfout: kan geen 'seek' doen naar blok in bestand '%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Leesfout: slecht blok in bestand '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -613,296 +613,296 @@ msgstr ""
 "*Interne fout*: poging tot schrijven naar een slecht blok.\n"
 "Schrijfverzoek is genegeerd.\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "'seek' is mislukt in write_block()"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Schrijffout: slecht blok in bestand '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "'seek' is mislukt in write_super_block()"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "kan superblok niet schrijven"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "kan inode-kaart niet schrijven"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "kan zone-kaart niet schrijven"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "kan inodes niet schrijven"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "'seek' is mislukt"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "reserveren van buffer voor superblok is mislukt"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "kan superblok niet lezen"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "ongeldig magisch getal in superblok"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Alleen blokken/zones van 1K zijn mogelijk"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "ongeldig 's_imap_blocks'-veld in superblok"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "ongeldig 's_zmap_blocks'-veld in superblok"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Kan geen buffer reserveren voor inode-kaart"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Kan geen buffer reserveren voor zone-kaart"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Kan geen buffer reserveren voor inodes"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Kan geen buffer reserveren voor inode-aantal"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Kan geen buffer reserveren voor zone-aantal"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Kan inode-kaart niet lezen"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Kan zone-kaart niet lezen"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Kan inodes niet lezen"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Waarschuwing: EersteZone != NormaleEersteZone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blokken\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "EersteGegevensZone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "ZoneGrootte=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "MaxGrootte=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Bestandssysteemstatus=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "naamlengte=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "Inode %d is gemarkeerd als ongebruikt, maar wordt gebruikt door bestand "
 "'%s'.\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Markeren als gebruikt"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Het bestand '%s' heeft modus %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Waarschuwing: het aantal inodes is te groot.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "hoofd-inode is geen map"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok is al eerder gebruikt.  Nu in bestand '%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Wissen"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d in bestand '%s' is gemarkeerd als ongebruikt."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Corrigeren"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "De map '%s' bevat een ongeldig inode-nummer voor bestand '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Verwijderen"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: ongeldige map: '.' is niet eerste\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: ongeldige map: '..' is niet tweede\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "**interne fout**"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: ongeldige map: grootte < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "'seek' is mislukt in bad_zone()"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Inode %d-modus is niet gewist."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inode %d is ongebruikt, maar gemarkeerd als gebruikt in de bitkaart."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inode %d is gebruikt, maar niet als zodanig gemarkeerd in de bitkaart."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Markeren"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modus = %07o), i_nlinks=%d, geteld=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks op geteld aantal instellen"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zone %d is gemarkeerd als in gebruik, maar geen bestand gebruikt het."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Markering verwijderen"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zone %d: in gebruik, geteld=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zone %d: niet in gebruik, geteld=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "ongeldige inode-grootte"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "ongeldige v2-inode-grootte"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "voor interactieve reparaties is een terminal vereist"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "kan '%s' niet openen: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s is schoon, geen controle.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Gedwongen bestandssysteemcontrole van %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Bestandssysteem op %s is vervuild, een controle is nodig.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -911,12 +911,12 @@ msgstr ""
 "\n"
 "%6ld inodes gebruikt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zones gebruikt (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -939,7 +939,7 @@ msgstr ""
 "------\n"
 "%6d bestanden\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1065,7 +1065,7 @@ msgstr "te veel inodes -- maximum is 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "niet genoeg ruimte: minstens %llu blokken nodig"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Apparaat: %s\n"
@@ -1242,10 +1242,8 @@ msgstr "%6.2f%% (%+ld bytes)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Fout bij sluiten van bestand\n"
+msgid "cannot close file %s"
+msgstr "Kan bestand '%s' niet openen"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1359,89 +1357,99 @@ msgstr ""
 "WAARSCHUWING: apparaatnummers afgekapt tot %u bits.  Dit betekent zeer\n"
 "waarschijnlijk dat sommige apparaatbestanden niet juist zullen zijn.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr ""
 "Gebruik:  %s [-c | -l bestandsnaam] [-nXX] [-iXX] /dev/naam [blokken]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s is aangekoppeld; zal hier geen bestandssysteem maken!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "'seek' naar opstartblok is mislukt in write_tables()"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "wissen van opstartsector is mislukt"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "'seek' is mislukt in write_tables()"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "kan superblok niet schrijven"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "schrijven van inode-kaart is mislukt"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "schrijven van zone-kaart is mislukt"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "schrijven van inodes is mislukt"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "'seek' is mislukt in write_block()"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "schrijven is mislukt in write_block()"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "te veel slechte blokken"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "onvoldoende goede blokken"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "reserveren van buffer voor superblok is mislukt"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "reserveren van buffers voor bitkaarten is mislukt"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "reserveren van buffer voor inodes is mislukt"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodes\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blokken\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1450,98 +1458,98 @@ msgstr ""
 "MaxGrootte=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "'seek' is mislukt tijdens testen van blokken"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 "Vreemde waarden in do_check(): waarschijnlijk een interne programmafout\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "'seek' is mislukt in check_blocks()"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "slechte blokken vóór gegevensgebied: kan geen bestandssysteem maken"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d slechte blokken\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "één slecht blok\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "kan slechteblokkenbestand niet openen"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "invoerfout in slechtbloknummer op regel %d\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "kan slechteblokkenbestand niet lezen"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "ongeldige inode-grootte"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "fout in strtol(): aantal blokken niet aangegeven"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat() is mislukt"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: openen is mislukt"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: apparaat %s is bezig"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "blokgrootte is kleiner dan fysieke sectorgrootte van %s"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "kan grootte van %s niet bepalen"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "zal niet proberen een bestandssysteem te maken op '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "aantal blokken is te klein"
@@ -1879,7 +1887,7 @@ msgstr "label is te lang; wordt afgekapt tot '%s'"
 msgid "%s: failed to write label"
 msgstr "%s: schrijven van label is mislukt"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2232,7 +2240,7 @@ msgid "   Logical"
 msgstr "   Logisch"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "[onbekend]"
 
@@ -2892,12 +2900,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD-schijflabelopdracht (m voor hulp): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Eerste %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Laatste %s of +aantal of +aantalK of +aantalM"
@@ -3045,7 +3053,7 @@ msgid "tracks/cylinder"
 msgstr "sporen/cilinder"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cilinders"
 
@@ -3112,12 +3120,12 @@ msgstr "Het maximum aantal partities is aangemaakt.\n"
 msgid "This partition already exists.\n"
 msgstr "Deze partitie bestaat al.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Waarschuwing: te veel partities (%d, maximum is %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3319,7 +3327,7 @@ msgstr "U moet instellen:"
 msgid "heads"
 msgstr "koppen"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sectoren"
 
@@ -3768,7 +3776,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Opstart   Begin       Einde     Blokken   ID  Systeem\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Apparaat"
 
@@ -3854,7 +3862,7 @@ msgstr "Totaal aantal gereserveerde sectoren %llu is groter dan maximum %llu\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "Er resteren %lld niet-gereserveerde %d-byte sectoren\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -4011,37 +4019,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Leegmaken van schijfbuffers...\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partitie %d heeft geen gegevensgebied\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nieuw begin van gegevens"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Expertopdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Aantal cilinders"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Aantal koppen"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Aantal sectoren"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Waarschuwing: sectorplaats wordt ingesteld voor DOS-compatibiliteit\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4054,33 +4062,33 @@ msgstr ""
 "Het programma 'fdisk' ondersteunt GPT niet.  Gebruik GNU 'parted'.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Schijf %s bevat geen geldige partitietabel\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan %s niet openen\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: onbekende opdracht\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Deze kernel vindt zelf de sectorgrootte -- optie '-b' wordt genegeerd\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4089,16 +4097,16 @@ msgstr ""
 "Waarschuwing: optie '-b' (sectorgrootte instellen) dient met\n"
 "slechts één apparaat gebruikt te worden.\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "OSF/1-schijflabel gevonden op %s; overgegaan in schijflabelmodus.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Opdracht (m voor hulp): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4107,16 +4115,16 @@ msgstr ""
 "\n"
 "Het huidige opstartbestand is: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Geef de naam van het nieuwe opstartbestand: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Opstartbestand blijft ongewijzigd.\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4435,9 +4443,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "    U hebt een ongebruikelijke naam gekozen voor het opstartbestand.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Sorry, u kunt de soort van niet-lege partities niet wijzigen.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Sorry, alleen root kan de systeemklok instellen.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4453,7 +4461,7 @@ msgstr ""
 "'SGI volumen' mag deze regel overtreden.  Typ JA als u zeker weet\n"
 "dat u de soort van deze partitie wilt wijzigen.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -4651,7 +4659,7 @@ msgstr "Ongebruikt gat: sectoren 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Ongebruikt gat: sectoren %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4660,7 +4668,7 @@ msgstr ""
 "Andere partities beslaan al de gehele schijf.\n"
 "Verwijder/verklein ze alvorens het opnieuw te proberen.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4669,12 +4677,12 @@ msgstr ""
 "Het wordt sterk aangeraden om de derde partitie de gehele schijf\n"
 "te laten beslaan en van het soort 'Gehele schijf' te laten zijn.\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sector %d is al gereserveerd\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4685,7 +4693,7 @@ msgstr ""
 "uw waarde %d %s overlapt een andere partitie.\n"
 "Uw invoer is gewijzigd tot %d %s.\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4695,7 +4703,7 @@ msgstr ""
 "beter\n"
 "als gehele schijf (5) laten, beginnend bij 0, met %u sectoren.\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4709,7 +4717,7 @@ msgstr ""
 "en opstartblok.  Typ JA als u erg zeker bent dat u die partitie van type 82\n"
 "(Linux-wisselgeheugen) wilt laten zijn: "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4730,7 +4738,7 @@ msgstr ""
 "Eenheid = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4743,28 +4751,28 @@ msgstr ""
 "Eenheid = %s van %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Optie   Begin     Einde   Blokken   ID  Systeem\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Aantal alternatieve cilinders"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Extra sectoren per cilinder"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Tussenruimtefactor"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Rotatiesnelheid (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Aantal fysieke cilinders"
 
@@ -5220,7 +5228,7 @@ msgstr "Schijf %s: kan geometrie niet bepalen\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Schijf %s: kan grootte niet bepalen\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5232,23 +5240,23 @@ msgstr ""
 "waarschijnlijk zinloos.\n"
 "(Gebruik de optie --force als u dit echt wilt doen.)\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Waarschuwing: ioctl(HDIO_GETGEO) zegt dat er %lu koppen zijn\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Waarschuwing: ioctl(HDIO_GETGEO) zegt dat er %lu sectoren zijn\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "Waarschuwing: ioctl(BLKGETSIZE/HDIO_GETGEO) zegt dat er %lu cilinders zijn\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5258,7 +5266,7 @@ msgstr ""
 "63.\n"
 "Dit zal problemen geven met alle software die C/K/S-adressering gebruikt.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5267,7 +5275,7 @@ msgstr ""
 "\n"
 "Schijf %s: %lu cilinders, %lu koppen, %lu sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5275,7 +5283,7 @@ msgstr ""
 "%s van partitie %s heeft een onmogelijke waarde voor koppen: %lu (moet "
 "liggen tussen 0 en %lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5284,7 +5292,7 @@ msgstr ""
 "%s van partitie %s heeft een onmogelijke waarde voor sectoren: %lu (moet "
 "liggen tussen 1 en %lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5293,7 +5301,7 @@ msgstr ""
 "%s van partitie %s heeft een onmogelijke waarde voor cilinders: %lu (moet "
 "liggen tussen 0 en %lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5302,12 +5310,12 @@ msgstr ""
 "Id  Naam\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Herinlezen van partitietabel...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5317,26 +5325,26 @@ msgstr ""
 "Voer partprobe(8) of kpartx(8) uit, of herstart uw systeem nu,\n"
 "alvorens 'mkfs' te gebruiken.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fout bij sluiten van %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: die partitie bestaat niet\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "onbekende eenheid -- \"sectoren\" wordt gebruikt\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "onbeschikbare eenheid  -- \"%s\" wordt gebruikt\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5345,12 +5353,12 @@ msgstr ""
 "Eenheid = cilinders van %lu bytes, blokken van 1024 bytes, tellend vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr " Apparaat Opst Begin   Einde   #cils   #blokken   ID  Systeem\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5359,12 +5367,12 @@ msgstr ""
 "Eenheid = sectoren van 512 bytes, tellend vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr " Apparaat Opst    Begin     Einde  #sectoren  ID  Systeem\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5373,12 +5381,12 @@ msgstr ""
 "Eenheid = blokken van 1024 bytes, tellend vanaf %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr " Apparaat Opst   Begin     Einde   #blokken   ID  Systeem\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5388,31 +5396,31 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr " Apparaat Ops Begin  Einde    MiB   #blokken   ID  Systeem\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "    begin: (c,k,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "    einde: (c,k,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie eindigt op cilinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Geen partities gevonden.\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5423,53 +5431,43 @@ msgstr ""
 "              C/K/S=*/%ld/%ld (in plaats van voor %ld/%ld/%ld);\n"
 "              dit overzicht neemt die eerste C/K/S-geometrie aan.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "geen partitietabel aanwezig\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "Vreemd: slechts %d partities gedefinieerd.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Waarschuwing: partitie %s heeft grootte 0, maar is niet aangegeven als Leeg\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Waarschuwing: partitie %s heeft grootte 0 en is opstartbaar\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 "Waarschuwing: partitie %s heeft grootte 0 maar een niet-nul beginsector\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Waarschuwing: partitie %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "valt niet binnen partitie %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Waarschuwing: partities %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "en %s overlappen\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Waarschuwing: partitie %d is leeg\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5478,18 +5476,18 @@ msgstr ""
 "Waarschuwing: partitie %s bevat een deel van de partitietabel (sector %lu),\n"
 "en zal deze vernielen als zij wordt gevuld\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Waarschuwing: partitie %s begint op sector 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 "Waarschuwing: partitie %s loopt door tot voorbij het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5497,17 +5495,17 @@ msgstr ""
 "Van de primaire partities kan er ten hoogste één uitgebreid zijn\n"
 "(onder Linux is dit echter geen probleem).\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s begint niet op een cilindergrens\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Waarschuwing: partitie %s eindigt niet op een cilindergrens\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5516,7 +5514,7 @@ msgstr ""
 "Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
 "opstarten.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5524,7 +5522,7 @@ msgstr ""
 "Waarschuwing: normaal gesproken kan men alleen van primaire\n"
 "partities opstarten.  LILO negeert de 'opstartbaar'-vlag.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5533,33 +5531,33 @@ msgstr ""
 "Voor LILO maakt dit niets uit, maar DOS MBR zal niet van deze schijf "
 "opstarten.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "begin"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partitie %s: begin: (c,k,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "einde"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partitie %s: einde: (c,k,s) verwacht: (%ld,%ld,%ld) gevonden: (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitie %s eindigt op cilinder %ld, na het einde van de schijf\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5569,7 +5567,7 @@ msgstr ""
 "%ld.\n"
 "(Alleen voor weergave.  De inhoud wordt niet gewijzigd.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5577,133 +5575,133 @@ msgstr ""
 "Waarschuwing: uitgebreide partitie begint niet op een cilindergrens.\n"
 "DOS en Linux zullen de inhoud verschillend interpreteren.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "te veel partities -- die na nummer (%d) worden genegeerd\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "een boom van partities?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk Manager gedetecteerd; kan dit niet aan -- gestopt\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-vingerafdruk gevonden -- gestopt\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "vreemd..., een uitgebreide partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "vreemd..., een BSD-partitie met grootte 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr "%s: onbekend partitietabeltype\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "optie '-n' werd gegeven: er is niets gewijzigd\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Opslaan van oude sectoren is mislukt -- gestopt\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Schrijven van partitie op %s is mislukt\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "lange of incomplete invoerregel -- gestopt\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "invoerfout: '=' verwacht na veld %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "invoerfout: onverwacht teken %c na veld %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "invoer niet herkend: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "getal is te groot\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "onbegrepen tekens na getal\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "geen ruimte voor partitiebeschrijver\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan omvattende uitgebreide partitie niet maken\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "te veel invoervelden\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Geen ruimte voor meer\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Onjuiste soort\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Waarschuwing: gegeven groote (%lu) is groter dan maximaal toegelaten grootte "
 "(%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Waarschuwing: lege partitie\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Waarschuwing: ongeldig partitiebegin (eerste mogelijkheid is %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "onbekende 'opstartbaar'-vlag -- kies '-' of '*'\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "een gedeeltelijke c,k,s-specificatie?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Uitgebreide partitie waar die niet verwacht werd\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "ongeldige invoer\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "te veel partities\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5716,103 +5714,184 @@ msgstr ""
 "Meestal hoeft u alleen <begin> en <grootte> te gebruiken (en mogelijk "
 "<soort>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
+msgstr "Gebruik:\n"
+
+#: fdisk/sfdisk.c:2332
+#, fuzzy, c-format
+msgid " %s [options] <device> [...]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties] [apparaat ...]\n"
 
-#: fdisk/sfdisk.c:2355
-#, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "  (apparaat is zoiets als /dev/hda of /dev/sda)"
-
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Opties:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "Gevaarlijke opties:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"  -G, --show-pt-geometry  de uit de partitietabel afgeleide geometrie "
+"weergeven"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"  -x, --show-extended     ook uitgebreide partities opnemen in de uitvoer,\n"
+"                          of beschrijvers ervan verwachten in de invoer"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Gebruik: "
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s apparaat            actieve partities op apparaat weergeven\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s apparaat n1 n2 ...  genoemde partities activeren, de rest de-activeren\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An apparaat        partitie n activeren, alle andere de-activeren\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5825,62 +5904,62 @@ msgstr ""
 "Het programma 'sfdisk' ondersteunt GPT niet.  Gebruik GNU 'parted'.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Gebruik '--force' om deze controle over te slaan.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "geen opdracht?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totaal: %llu blokken\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Gebruik:  sfdisk --print-id apparaat partitienummer\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Gebruik:  sfdisk --change-id apparaat partitienummer ID\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Gebruik:  sfdisk --id apparaat partitienummer [ID]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "slechts één apparaat is mogelijk (behalve met '-l' of '-s')\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan %s niet openen voor lezen-en-schrijven\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan %s niet openen om te lezen\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilinders, %ld koppen, %ld sectoren/spoor\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "kan grootte van %s niet opvragen\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "onjuiste 'opstartbaar'-vlag: 0x%x in plaats van 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5888,7 +5967,7 @@ msgstr ""
 "Voltooid\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5897,35 +5976,35 @@ msgstr ""
 "U hebt %d actieve, primaire partities.  Dit maakt niets uit voor LILO,\n"
 "maar DOS MBR start alleen op van een schijf met 1 actieve partitie.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partitie %s heeft ID %x en is niet verborgen\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Ongeldig ID %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Deze schijf is op dit moment in gebruik.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Fatale fout: kan %s niet vinden\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Waarschuwing: %s is geen blok-apparaat\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Even controleren of iemand deze schijf nu gebruikt...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5938,30 +6017,30 @@ msgstr ""
 "wisselgeheugenpartities op deze schijf uit.\n"
 "Of gebruik optie '--no-reread' om deze controle te onderdrukken.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Gebruik --force om alle controles te negeren.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Oude situatie:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partitie %d bestaat niet; kan deze dus niet veranderen!\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Nieuwe situatie:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5969,21 +6048,21 @@ msgstr ""
 "Hmm... vreemde partities -- er is niets gewijzigd.\n"
 "(Als u dit echt wilt, kunt u --force gebruiken.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Hmm... vreemde partities -- misschien moet u Nee antwoorden.\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bent u hiermee tevreden? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Wilt u dit naar de schijf schrijven? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5992,16 +6071,16 @@ msgstr ""
 "\n"
 "sfdisk: voortijdig einde van de invoer\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Gestopt -- er is niets gewijzigd.\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Antwoord met 'y' (ja) of 'n' (nee) of 'q' (stoppen).\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6010,7 +6089,7 @@ msgstr ""
 "De nieuwe partitietabel is met succes weggeschreven.\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6041,25 +6120,27 @@ msgstr "Vergrendelen van schijf %s... "
 msgid "(waiting) "
 msgstr "(wachten) "
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr "gelukt"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s is voltooid.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 msgid "failed"
 msgstr "mislukt"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "WAARSCHUWING: kan %s niet openen: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "WAARSCHUWING: ongeldige syntax op regel %d van %s\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -6071,37 +6152,37 @@ msgstr ""
 "    de eerstvolgende gelegenheid dienen toe te voegen.\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: niet gevonden\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s: wait: Geen dochterprocessen meer?!?\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "Waarschuwing... %s voor apparaat %s eindigde met signaal %d.\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s %s: status is %x -- zou nooit mogen gebeuren.\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Klaar met %s (afsluitwaarde %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: Fout %d tijdens uitvoeren van 'fsck.%s' voor %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6110,7 +6191,7 @@ msgstr ""
 "Ofwel alle ofwel geen van de bestandssysteemsoorten bij optie '-t'\n"
 "dienen te beginnen met 'no' of '!'.\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
@@ -6118,12 +6199,12 @@ msgstr ""
 "%s: onjuiste regel in /etc/fstab wordt overgeslagen:\n"
 "een 'bind'-aankoppeling met een niet-nul fsck-volgnummer\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: niet-bestaand apparaat wordt overgeslagen\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
@@ -6133,21 +6214,21 @@ msgstr ""
 "(optie \"nofail\" kan in fstab gebruikt worden om dit apparaat over te "
 "slaan)\n"
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck: kan %s niet controleren: geen 'fsck.%s' gevonden\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "Alle bestandssystemen worden gecontroleerd.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--wachten-- (stap %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6157,59 +6238,59 @@ msgstr ""
 "\n"
 "Gebruik:  %s [opties] [bestand ...]\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: te veel apparaten\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Kan %s niet openen\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "Is /proc wel aangekoppeld?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr ""
 "U dient root te zijn om naar overeenkomende bestandssystemen te zoeken: %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Kan geen overeenkomend bestandssysteem vinden: %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: te veel argumenten\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 #, fuzzy
 msgid "the -l option can be used with one device only -- ignore"
 msgstr "%s: optie '-l' is alleen geldig bij één apparaat -- genegeerd\n"
@@ -6229,33 +6310,81 @@ msgstr "lege optiereeks na optie '-l' of '--long'"
 msgid "unknown shell after -s or --shell argument"
 msgstr "onbekende shell na optie '-s' of '--shell'"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+"          getopt [opties] -o|--options optiereeks [opties] [--] parameters\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative             lange opties met één '-' toestaan\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                    deze hulptekst tonen\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=optiereeks  te herkennen lange opties\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=programmanaam      fouten rapporteren onder deze naam\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=optiereeks      te herkennen korte opties\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                   foutrapportage van getopt(3) uitzetten\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output            gewone uitvoer onderdrukken\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
 msgstr ""
+"  -s, --shell=shell             aanhalingsconventies van deze shell "
+"gebruiken\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr ""
+"  -T, --test                    bepalen of dit een verbeterde getopt(1) is\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unquoted                de uitvoer niet aanhalen\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                 programmaversie tonen\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "ontbrekende optiereeks"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "*interne fout*; neem contact op met de auteur"
 
@@ -6725,94 +6854,112 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Instellen van de tijdperkwaarde in de kernel is mislukt.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Opties:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "                   het soort Alpha dat u gebruikt  (zie hwclock(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Kan geen verbinding maken met auditsysteem\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "ontleden van PID is mislukt"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 "%s kent geen andere argumenten dan functies en opties.\n"
 "U gaf %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6821,48 +6968,48 @@ msgstr ""
 "U hebt verschillende functies aangegeven.\n"
 "Per aanroep kan slechts één functie worden gebruikt.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr "%s: De opties --utc en --localtime sluiten elkaar uit.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr "%s: De opties --adjust en --noadjfile sluiten elkaar uit.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr "%s: De opties --adjfile en --noadjfile sluiten elkaar uit.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: Bij --noadjfile moet u of --utc of --localtime aangeven.\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Geen bruikbare insteltijd.  Kan klok niet instellen.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Sorry, alleen root kan de hardwareklok instellen.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Sorry, alleen root kan de systeemklok instellen.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6870,13 +7017,13 @@ msgstr ""
 "Sorry, alleen root kan in de kernel de tijdperkwaarde voor de klok "
 "instellen.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "Kan op geen enkele bekende manier toegang krijgen tot de hardwareklok.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7058,7 +7205,7 @@ msgid "failed to read mtab"
 msgstr "lezen van %s is mislukt"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr "initialiseren van libmount-iterator is mislukt"
 
@@ -7103,45 +7250,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, c-format
 msgid ""
 "\n"
@@ -7150,25 +7337,25 @@ msgstr ""
 "\n"
 "Voor meer informatie zie mount(8).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr "geheugenreservering voor libmount-context is mislukt"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 msgid "failed to append options"
 msgstr "het achtervoegen van opties is mislukt"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 msgid "failed to set options pattern"
 msgstr "het instellen van het opties-patroon is mislukt"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 #, fuzzy
 msgid "only one <source> may be specified"
 msgstr "er mag slechts één <bron> gegeven worden"
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 msgid "failed to allocate source buffer"
 msgstr "reserveren van bronbuffer is mislukt"
 
@@ -7252,7 +7439,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: PAM-fout -- gestopt: %s"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Wachtwoord: "
 
@@ -7690,46 +7877,47 @@ msgstr "EXCESSIEF aantal witregels"
 msgid "too many bare linefeeds."
 msgstr "te veel witregels"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr "afgebroken na %d seconden"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Laatste keer ingelogd: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "vanaf %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "op %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 msgid "write lastlog failed"
 msgstr "schrijven van 'lastlog' is mislukt"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "INLOGGEN IS MISLUKT VANAF %s -- %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "INLOGGEN IS MISLUKT OP %s -- %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d INLOGMISLUKKINGEN VANAF %s -- %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d INLOGMISLUKKINGEN OP %s --  %s"
@@ -7754,7 +7942,7 @@ msgstr "toegang geweigerd"
 msgid "setuid failed"
 msgstr "setuid() is mislukt"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "uitvoeren van '%s' is mislukt"
@@ -7799,8 +7987,8 @@ msgstr "%s: kan context voor %s niet instellen"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: kan %s niet ontgrendelen: %s (uw wijzigingen staan nog in %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "fork() is mislukt"
 
@@ -7852,24 +8040,21 @@ msgstr "onjuiste jaarwaarde;  gebruik 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Gebruik:  %s [-13smjyV] [[[dag] maand] jaar]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7979,32 +8164,32 @@ msgstr " Verwijderen"
 msgid "failed to add line to output"
 msgstr "toevoegen van regel aan uitvoer is mislukt"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, c-format
 msgid "%s: parse error at line %d"
 msgstr "%s: ontledingsfout op regel %d"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "initialiseren van libmount-tabel is mislukt"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "kan %s niet lezen"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "initialiseren van libmount-tabel is mislukt"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8021,42 +8206,67 @@ msgstr ""
 "  %1$s [opties] <apparaat> <aankoppelingspunt>\n"
 "  %1$s [opties] [--source <apparaat>] [--target <aankoppelingspunt>]\n"
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, c-format
 msgid ""
 "\n"
@@ -8065,7 +8275,7 @@ msgstr ""
 "\n"
 "Beschikbare kolommen:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
@@ -8074,40 +8284,40 @@ msgstr ""
 "\n"
 "Voor meer informatie zie findmnt(1).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr "opties gaan niet samen"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr "onbekende richting '%s'"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "ontleden van tijdstipwaarde is mislukt"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr "opties '--target' en '--source' gaan niet samen met andere argumenten"
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr "initialiseren van libmount-cache is mislukt"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr "initialiseren van uitvoertabel is mislukt"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr "initialiseren van uitvoerkolom is mislukt"
 
@@ -8131,12 +8341,12 @@ msgstr "%s: kan proces '%s' niet vinden\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: onbekend signaal %s; geldige signalen zijn:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Gebruik:  %s [ -s signaal | -p ] [ -a ] PID...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "          %s -l [ signaal ]\n"
@@ -8156,87 +8366,86 @@ msgstr "socket: %s.\n"
 msgid "connect %s"
 msgstr "verbinding: %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "verbinden"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Volgend bestand: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "ontleden van prioriteit is mislukt"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Waarde ligt buiten bereik.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: onbekende voorzieningsnaam in prioriteit: %s\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: onbekende prioriteitsnaam: %s\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties] [bestand ...]\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8370,8 +8579,8 @@ msgid "failed to open device directory in sysfs"
 msgstr "openen van apparatenmap in 'sysfs' is mislukt"
 
 #: misc-utils/lsblk.c:792
-#, c-format
-msgid "%s: failed to get whole-list devno"
+#, fuzzy, c-format
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: achterhalen van apparaatnummer van gehele schijf is mislukt"
 
 #: misc-utils/lsblk.c:809
@@ -8389,13 +8598,14 @@ msgstr "%s: lezen van koppeling is mislukt"
 msgid "failed to parse list '%s'"
 msgstr "ontleden van lijst '%s' is mislukt"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 "de lijst van uitgesloten apparaten is te lang (de limiet is %d apparaten)"
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, c-format
 msgid ""
 "\n"
@@ -8405,7 +8615,7 @@ msgstr ""
 "\n"
 "Gebruik:  %s [opties] [apparaat ...]\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8428,7 +8638,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8437,33 +8647,33 @@ msgstr ""
 "\n"
 "Voor meer informatie zie lsblk(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Gebruik:  %s [optie]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Kan %s niet openen\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%d bytes ontvangen van %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "uitvoeren van '%s' is mislukt"
@@ -8483,26 +8693,15 @@ msgstr "kan status van '%s' niet opvragen"
 msgid "%s - No such file or directory\n"
 msgstr "%s -- Bestand of map bestaat niet\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties] padnaam [padnaam...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Opties:\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8521,8 +8720,7 @@ msgstr ""
 "  -n, --nosymlinks     symbolische koppelingen niet volgen\n"
 "  -x, --mountpoints    aankoppelingspunten markeren met een 'D'\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8530,12 +8728,12 @@ msgstr ""
 "\n"
 "Voor meer informatie zie namei(1).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "argument van '--date' is te lang\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s: limiet op aantal symbolische koppelingen is overschreden"
@@ -8545,166 +8743,164 @@ msgstr "%s: limiet op aantal symbolische koppelingen is overschreden"
 msgid "renaming %s to %s failed"
 msgstr "%s: hernoemen van %s tot %s is mislukt: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Gebruik:  %s [opties] apparaat ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "ongeldige argumenten"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "schrijven"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "gelezen aantal"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "ongeldige antwoordlengte"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "Openen/aanmaken van %s is mislukt: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "Vergrendelen van %s is mislukt: %s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "uuidd-dienst draait al onder PID %s\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "Kan geen UNIX-stream-socket aanmaken: %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Kan UNIX-socket %s niet binden: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Kan niet luisteren op UNIX-socket %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Fout tijdens lezen van cliënt; lengte = %d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "bewerking %d, gegeven getal = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr "bewerking %d\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "Gegenereerde tijds-UUID: %s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "Gegenereerde willekeurige UUID: %s\n"
 
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "Gegenereerde tijds-UUID: %s, en %d opvolgende\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "Gegenereerde tijds-UUID: %s, en %d opvolgende\n"
+msgstr[1] "Gegenereerde tijds-UUID: %s, en %d opvolgende\n"
 
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "Gegenereerde %d UUID's:\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "Gegenereerde %d UUID's:\n"
+msgstr[1] "Gegenereerde %d UUID's:\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "Ongeldige bewerking %d\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "Onverwachte antwoordlengte (%d) van server\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "Ongeldig getal: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Fout bij aanroepen van uuidd-dienst (%s): %s\n"
 
-#: misc-utils/uuidd.c:546
-#, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s en opvolgende %d UUID's\n"
+#: misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s en opvolgende %d UUID's\n"
+msgstr[1] "%s en opvolgende %d UUID's\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "Lijst van UUID's:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "Kan uuidd met PID %d niet elimineren: %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "uuidd met PID %d is geëlimineerd\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8712,31 +8908,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties] [bestand ...]\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8769,29 +8964,31 @@ msgid "%s: write failed"
 msgstr "%s: schrijven is mislukt"
 
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd bytes ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] gewist vanaf positie 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "ongeldige plaatswaarde '%s' gegeven"
 
-#: misc-utils/wipefs.c:306
+#: misc-utils/wipefs.c:305
 #, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Gebruik:  %s [opties] apparaat ...\n"
+
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 "  -a, --all           alle magische tekenreeksen wissen (WEET WAT U DOET!)\n"
 "  -h, --help          deze hulptekst tonen\n"
@@ -8799,7 +8996,7 @@ msgstr ""
 "  -o, --offset GETAL  startpositie voor wissen, in bytes\n"
 "  -p, --parsable      herbruikbare i.p.v. leesbare uitvoer produceren\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8808,11 +9005,11 @@ msgstr ""
 "\n"
 "Voor meer informatie zie wipefs(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "opties '--offset' en '--all' gaan niet samen"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr "momenteel wordt slechts één apparaatargument ondersteund"
 
@@ -8909,63 +9106,63 @@ msgstr "fout bij wijzigen van eigenaar van %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan %s niet hernoemen tot %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: map '/dev' bestaat niet."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: kan grootte van apparaat %s niet instellen: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", beginpunt %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", maximale grootte %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", codering %s (soort %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", beginpunt %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", coderingssoort %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kan geen informatie verkrijgen over apparaat %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan apparaat %s niet openen: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: geen toegangsrechten tot /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kan geen vrij lus-apparaat vinden"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8975,59 +9172,57 @@ msgstr ""
 "        lus-apparaat?  (Dan moet u de kernel opnieuw compileren,\n"
 "        of misschien een 'modprobe loop' doen?)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Onvoldoende geheugen beschikbaar tijdens lezen van wachtwoord"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "waarschuwing: %s is al gerelateerd aan %s\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "waarschuwing: %s is schrijfbeveiligd en wordt als alleen-lezen "
 "aangekoppeld.\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kan pagina's niet vastzetten in het geheugen -- gestopt\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl(LOOP_SET_FD) is mislukt: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu) is gelukt\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "lus-apparaat %s is uitgeschakeld\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "kan lus-apparaat %s niet uitschakelen: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Deze versie van 'mount' is gecompileerd zonder lus-ondersteuning.\n"
 "Hercompilatie is nodig.\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9035,7 +9230,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Gebruik:\n"
@@ -9048,19 +9243,17 @@ msgstr ""
 "  %1$s -j | --associated <bestand> [-o <nummer>]       gerelateerden tonen\n"
 "  %1$s [opties] {-f|--find|<lus-apparaat>} <bestand>   instellen\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9075,32 +9268,32 @@ msgstr ""
 "       --show                apparaatnaam tonen (bij '-f <bestand>')\n"
 "  -v | --verbose             gedetailleerde uitvoer produceren\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "%s: ongeldige positie '%s' opgegeven"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "%s: ongeldige groottegrens '%s' opgegeven"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Lus-apparaat is %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "afgepakt lus-apparaat=%s; ... nieuwe poging\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: apparaat %s is bezig"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9694,14 +9887,17 @@ msgstr "*programmeerfout* in aanroep van xstrndup()"
 msgid "not enough memory"
 msgstr "onvoldoende geheugen beschikbaar"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "De parameter NAAM kan zijn:\n"
@@ -9711,78 +9907,63 @@ msgstr ""
 "  <bestand>                   naam van te gebruiken bestand\n"
 "\n"
 
-#: mount/swapon.c:102
-#, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
 msgstr ""
 "\n"
-"Gebruik:\n"
-"  %1$s -a [-e] [-v] [-f]                 alle wisselgeheugens inschakelen "
-"die\n"
-"                                           vermeld staan in /etc/fstab\n"
-"  %1$s [-p PRIORITEIT] [-d] [-v] [-f] NAAM    dit wisselgeheugen "
-"inschakelen\n"
-"  %1$s -s                                gebruikssamenvatting tonen\n"
-"  %1$s -h                                deze hulptekst tonen\n"
-"  %1$s -V                                programmaversie tonen\n"
-"\n"
+"Gebruik:  %s [opties] [bestand ...]\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Gebruik:\n"
-"  %1$s -a [-v]      alle wisselgeheugens uitschakelen\n"
-"  %1$s [-v] NAAM    dit wisselgeheugen uitschakelen\n"
-"  %1$s -h           deze hulptekst tonen\n"
-"  %1$s -V           programmaversie tonen\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:128
+msgid ""
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
+msgstr ""
+
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Onverwachte bestandsindeling"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: herinitialisatie van het wisselgeheugen"
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "execv() is mislukt"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "waitpid() is mislukt"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: 'lseek' is mislukt"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: schrijven van vingerafdruk is mislukt"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
@@ -9790,57 +9971,57 @@ msgstr ""
 "byte-volgorde"
 
 # Eén van de volgende twee berichten wordt ingevuld voor bovenstaand woord "byte-volgorde".
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "verschillende"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "zelfde"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: onveilige toegangsrechten: %04o -- aangeraden wordt: %04o"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: onveilige bestandseigenaar %d -- 0 (root) wordt aangeraden"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: wordt overgeslagen -- het lijkt gaten te hebben."
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: bepalen van grootte is mislukt"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: lezen van kop van wisselgeheugen is mislukt"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr "%s: paginagrootte=%d, wisselgrootte=%llu, apparaatgrootte=%llu"
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 "%s: opgeslagen grootte (0x%08llx) van wisselgeheugen is groter dan de "
 "feitelijke ruimte"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: opgeslagen paginagrootte klopt niet"
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9848,36 +10029,36 @@ msgstr ""
 "%s: opgeslagen paginagrootte klopt niet;\n"
 "gebruik '--fixpgsz' om dit te corrigeren"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr "%s: slaapgegevens gevonden -- vingerafdruk wordt opnieuw geschreven"
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s op %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon is mislukt"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "kan geen apparaat vinden voor %s"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "U bent niet root."
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff is mislukt"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10143,7 +10324,7 @@ msgstr "%s: fout bij verwijderen van partitie %d"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "%s: fout bij verwijderen van partities %d-%d"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, fuzzy, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr "gegeven bereik <%d:%d> is onzinnig"
@@ -10203,21 +10384,15 @@ msgstr "%s: '%s'-partitietabel gedetecteerd\n"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "%s: '%s'-partitietabel bevat geen bruikbare partities"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [-a|-d|-s] [--nr <N:M> | <partitie>] <apparaat>\n"
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10228,15 +10403,14 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
@@ -10244,7 +10418,7 @@ msgstr ""
 "\n"
 "Beschikbare kolommen (voor '--show') zijn:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, c-format
 msgid ""
 "\n"
@@ -10253,26 +10427,26 @@ msgstr ""
 "\n"
 "Voor meer informatie zie partx(8).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "opties gaan niet samen"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 msgid "failed to parse --nr <M-N> range"
 msgstr "ontleden van bereik in '--nr <M-N>' is mislukt"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "<partitie> en optie '--nr' gaan niet samen"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "%s: initialiseren van blkid-sonde is mislukt"
@@ -10427,7 +10601,7 @@ msgstr "instellen van beleid voor PID %d is mislukt"
 msgid "failed to set pid %d's policy"
 msgstr "instellen van beleid voor PID %d is mislukt"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "uitvoeren van %s is mislukt"
@@ -10715,7 +10889,7 @@ msgstr "%s: %ld is standaard drempelwaarde en %ld is standaard tijdslimiet\n"
 msgid "Can't set signal handler"
 msgstr "Kan geen signaalverwerker instellen"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday() is mislukt"
 
@@ -10724,7 +10898,7 @@ msgstr "gettimeofday() is mislukt"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Kan ioctl(CYGETMON) niet uitvoeren op %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10732,12 +10906,12 @@ msgstr ""
 "%s: %lu onderbrekingen, %lu/%lu tekens;\n"
 "fifo: %lu drempelwaarde, %lu tijdslimiet, %lu maximum, %lu nu\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f onderbrekingen/sec; %f ontvangen, %f verzonden (tekens/sec)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10745,7 +10919,7 @@ msgstr ""
 "%s: %lu onderbrekingen, %lu tekens;\n"
 "fifo: %lu drempelwaarde, %lu tijdslimiet, %lu maximum, %lu nu\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f onderbrekingen/sec; %f ontvangen (tekens/sec)\n"
@@ -10837,130 +11011,109 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "kan er geen achtergronddienst van maken"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Gebruik:  %s [opties]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "ontleden van klasse (bij '-c') is mislukt"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "onbekende gebruiker %s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "ontleden van lijst '%s' is mislukt"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "onbekende richting '%s'"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync() is mislukt"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "schrijven is mislukt: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "ontleden van positie '%s' is mislukt"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "geen opdracht?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctl() is mislukt"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
 msgstr ""
-"Gebruik:  %s [opties] <bestandsnaam>\n"
 "\n"
-"Opties:\n"
+"Gebruik:  %s [opties] [bestand ...]\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10972,7 +11125,7 @@ msgstr ""
 "  -o, --offset <getal>   positie van de reservering, in bytes\n"
 "  -l, --length <getal>   lengte van de reservering, in bytes\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -10981,31 +11134,31 @@ msgstr ""
 "\n"
 "Voor meer informatie zie fallocate(1).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "geen lengte gegeven"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "ongeldige lengte gegeven"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "ongeldige plaatswaarde gegeven"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "geen bestandsnaam gegeven"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr "onverwacht aantal argumenten"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "'keep-size'-modus (optie '-n') wordt niet ondersteund"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate() is mislukt"
@@ -11013,69 +11166,70 @@ msgstr "%s: fallocate() is mislukt"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s: %s vereist precies één opdrachtargument\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: kan vergrendelingsbestand %s niet openen: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: ongeldig getal: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s: vereist een bestandsdescriptor, een bestand of een map\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: fork() is mislukt: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Gebruik:  %s [opties] <aankoppelingspunt>\n"
 "\n"
 "Opties:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
+#, fuzzy
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 "  -h, --help        deze hulptekst tonen\n"
 "  -f, --freeze      het bestandssysteem bevriezen\n"
 "  -u, --unfreeze    het bestandssysteem ontdooien\n"
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11083,36 +11237,35 @@ msgstr ""
 "\n"
 "Voor meer informatie zie fsfreeze(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr "geen actie gegeven"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr "geen bestandsnaam gegeven"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat() is mislukt"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr "%s: is geen map"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr "%s: bevriezen is mislukt"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s: ontdooien is mislukt"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11127,8 +11280,7 @@ msgstr ""
 " -m, --minimum <getal>  minimum te verwerpen extent-lengte\n"
 " -v, --verbose          het aantal verworpen bytes tonen\n"
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11136,97 +11288,86 @@ msgstr ""
 "\n"
 "Voor meer informatie zie fstrim(1).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, c-format
 msgid "failed to parse length: %s"
 msgstr "ontleden van lengte '%s' is mislukt"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, c-format
 msgid "failed to parse offset: %s"
 msgstr "ontleden van positie '%s' is mislukt"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ontleden van minimum-extent-lengte '%s' is mislukt"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 msgid "no mountpoint specified."
 msgstr "geen aankoppelingspunt opgegeven"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, c-format
 msgid "%s: not a directory"
 msgstr "%s: is geen map"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: ioctl (FITRIM) is mislukt"
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
+#, fuzzy, c-format
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr "%s: %<PRIu64> bytes zijn getrimd\n"
 
-#: sys-utils/ipcmk.c:84
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr ""
-"\n"
-"Gebruik:  %s [opties]\n"
-"\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <grootte>   gedeeld geheugensegment aanmaken met deze grootte\n"
 "  -S <aantal>    semafoorarray aanmaken met <aantal> elementen\n"
 "  -Q             berichtenwachtrij aanmaken\n"
 "  -p <modus>     deze toegangsrechten toekennen (standaard 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Voor meer informatie zie ipcmk(1).\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "aanmaken van gedeeld geheugensegment is mislukt"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "Gedeeld geheugensegment-ID: %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "aanmaken van berichtenwachtrij is mislukt"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "Berichtenwachtrij-ID: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "aanmaken van semafoor is mislukt"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "Semafoor-ID: %d\n"
@@ -11748,8 +11889,8 @@ msgstr ""
 "Gedeeld geheugensegment met shm-ID=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "UID=%d  GID=%d,  maker-UID=%d\t  maker-GID=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11758,8 +11899,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "modus=%#o  toegangsrechten=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld  laatste-PID=%d  maker-PID=%d  aanhechtingen=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11791,8 +11932,8 @@ msgstr ""
 "Berichtenwachtrij met msq-ID=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "UID=%d  GID=%d,  maker-UID=%d  maker-GID=%d,  modus=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11826,8 +11967,8 @@ msgstr ""
 "Semafoorarray met sem-ID=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "UID=%d  GID=%d,  maker-UID=%d  maker-GID=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11875,17 +12016,15 @@ msgstr "PID"
 msgid "invalid iflag: %s"
 msgstr "ongeldige invoervlag: %s"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [-dhV78neo12] [-s <snelheid>] [-i [-]<invoervlag>]\n"
 "                  <lijnprotocol> <apparaat>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11893,7 +12032,7 @@ msgstr ""
 "\n"
 "Mogelijke lijnprotocollen zijn:\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
@@ -11901,50 +12040,50 @@ msgstr ""
 "\n"
 "Mogelijke invoervlaggen zijn:\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "ongeldige snelheid: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "'ldattach' uit %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "ongeldige optie"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "ongeldig lijnprotocol: %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s is geen seriële lijn"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet bepalen"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "snelheid %d is niet mogelijk"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan terminaleigenschappen van %s niet instellen"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "kan lijnprotocol niet instellen"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "kan er geen achtergronddienst van maken"
 
@@ -12099,15 +12238,14 @@ msgstr "%s-cache:"
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMA-node%d CPU('s):"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "Toont informatie over de processorarchitectuur.\n"
 "\n"
@@ -12116,26 +12254,22 @@ msgstr ""
 "  -s, --sysroot MAP   deze MAP als hoofdmap gebruiken\n"
 "  -x, --hex           hexadecimaal masker tonen in plaats van lijst\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12144,12 +12278,12 @@ msgstr ""
 "\n"
 "Voor meer informatie zie mount(8).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s: is geen map"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s is aangekoppeld.\t "
@@ -12185,47 +12319,45 @@ msgstr ""
 "  -v         gedetailleerde uitvoer produceren\n"
 "  -V         programmaversie tonen\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: fout bij schrijven van %s: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Omgekeerde byte-volgorde wordt aangenomen.\n"
 "Gebruik '-n' om de normale byte-volgorde te gebruiken.\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Bemonsteringsstap: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): foutieve regel in symbolenbestand\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kan \"_stext\" niet vinden in %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profileringsadres valt buiten bereik.  Verkeerd symbolenbestand?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "totaal"
 
-#: sys-utils/renice.c:55
-#, c-format
+#: sys-utils/renice.c:56
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12238,10 +12370,8 @@ msgstr ""
 "          %1$s -v | --version\n"
 
 #: sys-utils/renice.c:62
-#, c-format
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12258,8 +12388,7 @@ msgstr ""
 " -u, --user <naam|ID>    te beïnvloeden gebruiker (naam of UID)\n"
 " -v, --version           programmaversie tonen\n"
 
-#: sys-utils/renice.c:70
-#, c-format
+#: sys-utils/renice.c:69
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12267,71 +12396,60 @@ msgstr ""
 "\n"
 "Voor meer informatie zie renice(1).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "'renice' uit %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, c-format
 msgid "unknown user %s"
 msgstr "onbekende gebruiker %s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, c-format
 msgid "bad value %s"
 msgstr "ongeldige waarde %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr "proces-ID"
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 msgid "user ID"
 msgstr "gebruikers-ID"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr "procesgroeps-ID"
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "achterhalen van prioriteit voor %d is mislukt (%s)"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "instellen van prioriteit voor %d is mislukt (%s)"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d (%s): oude prioriteit is %d, nieuwe prioriteit is %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Gebruik:  %s [opties]\n"
-"\n"
-"Opties:\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "    -d | --device <apparaat>   te gebruiken hardwarklok (rtc0|rtc1|...)\n"
 "    -l | --local               de hardwareklok bevat lokale tijd\n"
@@ -12345,8 +12463,7 @@ msgstr ""
 "    -v | --verbose             gedetailleerde uitvoer produceren\n"
 "    -V | --version             programmaversie tonen\n"
 
-#: sys-utils/rtcwake.c:100
-#, c-format
+#: sys-utils/rtcwake.c:101
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12354,150 +12471,150 @@ msgstr ""
 "\n"
 "Voor meer informatie zie rtcwake(8).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 msgid "read rtc time failed"
 msgstr "lezen van hardwarekloktijd is mislukt"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 msgid "read system time failed"
 msgstr "lezen van systeemtijd is mislukt"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 msgid "convert rtc time failed"
 msgstr "omzetten van hardwarekloktijd is mislukt"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 msgid "set rtc alarm failed"
 msgstr "zetten van de wekker is mislukt"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr "inschakelen van de wekker is mislukt"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr "zetten van de wekker is mislukt"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 msgid "read rtc alarm failed"
 msgstr "lezen van de wekker is mislukt"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr "wekker: uit\n"
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 msgid "convert time failed"
 msgstr "omzetten van hardwarekloktijd is mislukt"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr "wekker: aan  %s"
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "onbekende slaaptoestand '%s'"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 msgid "failed to parse seconds value"
 msgstr "ontleden van secondenwaarde is mislukt"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 msgid "failed to parse time_t value"
 msgstr "ontleden van tijdstipwaarde is mislukt"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: aangenomen wordt dat de hardwareklok UTC bevat...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "UTC wordt gebruikt.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Lokale tijd wordt gebruikt.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr "u dient een wektijd op te geven, via '-s' of '-t'"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "wekgebeurtenissen voor %s zijn niet ingeschakeld"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "wektijdstip %ld, systeemtijd %ld, hardwarekloktijd %ld, seconden %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr "tijd loopt niet achteruit naar %s"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: ontwaking via %s op %s"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: ontwaking uit '%s' via %s op %s"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr "slaapmodus: nee -- gestopt\n"
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr "slaapmodus: uit -- uitvoeren van %s\n"
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, c-format
 msgid "unable to execute %s"
 msgstr "kan %s niet uitvoeren"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr "slaapmodus: aan -- lezen van hardwareklok\n"
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 msgid "rtc read failed"
 msgstr "lezen van hardwareklok is mislukt"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr "slaapmodus: uitgeschakeld -- wekker wordt uitgeschakeld\n"
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr "slaapmodus: tonen -- wekkerinfo wordt getoond\n"
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr "slaapmodus: %s -- de computer gaat slapen\n"
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr "uitschakelen van hardwareklok-interrupt is mislukt"
 
@@ -12569,16 +12686,16 @@ msgstr ""
 "%s: %s\n"
 "Typ '%s --help' voor meer informatie.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: Onbekende architectuur"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Te weinig argumenten"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Instellen van systeemeigenschappen voor %s is mislukt"
@@ -12661,20 +12778,19 @@ msgstr "%s gebruikt IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s wordt actief gepolst\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "Gebruik:  %s [optie...] <programma> [argument...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "Voert een programma uit met sommige naamsruimten ontkoppeld van "
 "moederproces.\n"
@@ -12685,8 +12801,7 @@ msgstr ""
 "  -n, --net      netwerknaamsruimte niet delen\n"
 "  -u, --uts      UTS-naamsruimte niet delen (hostnaam en dergelijke)\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12694,147 +12809,147 @@ msgstr ""
 "\n"
 "Voor meer informatie zie unshare(1).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshare() is mislukt"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "kan groeps-ID niet instellen"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "kan gebruikers-ID niet instellen"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: kan %s niet uitvoeren: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "fout: bij wijzigen van huidige werkmap naar %s"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: kan proces '%s' niet vinden\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: kan %s niet uitvoeren: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "reserveren van uitvoerbuffer is mislukt"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "ongeldige tijdslimiet: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Te weinig argumenten"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "reserveren van uitvoerbuffer is mislukt"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "ongeldige snelheid: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "te veel alternatieve snelheden"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: kan deze niet openen als standaardinvoer: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: is geen byte-apparaat"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: is niet open voor lezen-en-schrijven"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: probleem met verdubbelen van standaardinvoer en -uitvoer: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "type: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: gelezen: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: invoeroverloop"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12846,69 +12961,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "gebruiker"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "gebruikers"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 msgid "ttyname failed"
 msgstr "ttyname() is mislukt"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, c-format
 msgid "stat %s failed"
 msgstr "status opvragen van %s is mislukt"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 msgid "is y"
 msgstr "is 'y' (ja)"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 msgid "is n"
 msgstr "is 'n' (nee)"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, c-format
 msgid "change %s mode failed"
 msgstr "verandering van modus van %s is mislukt"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "ongeldige invoervlag: %s"
@@ -12924,54 +13033,48 @@ msgstr ""
 "gebruik '%s [opties] %s' als u deze echt wilt gebruiken.\n"
 "Script is niet gestart.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties] [bestand ...]\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "kan timingsbestand '%s' niet openen"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script is gestart, het bestand heet '%s'.\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script is gestart op %s."
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: kan scriptbestand niet schrijven: %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12980,79 +13083,76 @@ msgstr ""
 "\n"
 "Script is beëindigd op %s."
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script is beëindigd, het bestand heet '%s'.\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty() is mislukt\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Onvoldoende PTY's\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <timingsbestand> [<scriptbestand> [<versnelling>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "er werd een getal verwacht, maar '%s' werd gevonden"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "versnelling is '%s'"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "schrijven naar standaarduitvoer is mislukt"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "onverwacht einde van bestand op %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "kan scriptbestand %s niet lezen"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "onverwacht aantal argumenten"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "kan scriptbestand '%s' niet openen"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "kan timingsbestand %s niet lezen"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "timingsbestand %s: %lu: onverwachte opmaak"
@@ -13063,50 +13163,47 @@ msgid "Argument error."
 msgstr "%s: Onbekend argument -- gebruik:\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13115,61 +13212,61 @@ msgstr ""
 "\n"
 "Voor meer informatie zie lsblk(8).\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "kan scherm niet op zwart zetten\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "kan scherm niet uit zwartstand halen\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "kan schermtoestand niet opvragen\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "kan stroombesparingsmodus niet instellen\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "kan apparaat %s niet openen om te schrijven\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl() is mislukt: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Fout bij schrijven van schermafdruk\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Kan %s niet lezen\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM is niet gedefinieerd.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: onbekend signaal %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13198,144 +13295,149 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties] [bestand ...]\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "ongeldige optie"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "ongeldige tijdslimiet: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "kan tijdelijk bestand niet openen"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "kan gebruikers-ID niet instellen"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Kan schijfgrootte niet bepalen"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Bericht van %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr "zal %s niet direct lezen;  gebruik standaardinvoer"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 msgid "fstat failed"
 msgstr "fstat() is mislukt"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 msgid "fread failed"
 msgstr "fread() is mislukt"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Gebruik:  %s [opties] padnaam [padnaam...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: kan de naam van uw tty niet vinden\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: u hebt berichtentoegang uitgezet\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s is niet ingelogd op %s\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s heeft berichten uitgezet op %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s is niet ingelogd\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s heeft berichten uitgezet\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s is meerdere keren ingelogd; er wordt geschreven naar %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Invoerregel is te lang."
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Bericht van %s@%s (als %s) op %s om %s..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Bericht van %s@%s op %s om %s..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc() is mislukt"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Gebruik:  %s [opties]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13533,7 +13635,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13734,7 +13836,7 @@ msgstr ""
 "\n"
 "Patroon niet gevonden\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Patroon niet gevonden"
 
@@ -13799,7 +13901,7 @@ msgstr "hexdump: ongeldige opmaak {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: ongeldig conversieteken %%%s\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13827,7 +13929,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13835,81 +13937,81 @@ msgstr ""
 "%s: Gebruik:  %s [-aantal_regels_per_pagina] [-p te_gebruiken_prompt]\n"
 "              [-cefnrs] [+regelnummer] [+/patroon/] [bestand ...]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: optie vereist een argument -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: ongeldige optie -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...verder...\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...terug...\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Geen volgend bestand"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Geen voorgaand bestand"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Leesfout in bestand %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Onverwachte EOF in bestand %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Onbekende fout in bestand %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kan geen tijdelijk bestand maken\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Fout in reguliere expressie: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Geen eerdere zoektekst"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Kan deze niet openen: "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "opgeslagen"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !opdracht is niet toegestaan in beperkte modus.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() is mislukt; probeer het later opnieuw\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Volgende bestand: "
 
@@ -13983,8 +14085,8 @@ msgstr ""
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -14000,38 +14102,157 @@ msgstr "ontleden van positie '%s' is mislukt"
 msgid "no input file specified"
 msgstr "geen bestandsnaam gegeven"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr ""
+"\n"
+"Gebruik:  %s [opties] [bestand ...]\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "problemen bij lezen van terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "onbekende stuurcode in invoer: %o, %o"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 msgid "Input line too long."
 msgstr "Invoerregel is te lang."
 
-#~ msgid "Usage:\n"
-#~ msgstr "Gebruik:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Fout bij sluiten van bestand\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Sorry, u kunt de soort van niet-lege partities niet wijzigen.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Waarschuwing: partitie %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Waarschuwing: partities %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "en %s overlappen\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gebruik:  %s [opties] [apparaat ...]\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "  (apparaat is zoiets als /dev/hda of /dev/sda)"
+
+#~ msgid "success"
+#~ msgstr "gelukt"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd bytes ["
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gebruik:\n"
+#~ "  %1$s -a [-e] [-v] [-f]                 alle wisselgeheugens inschakelen "
+#~ "die\n"
+#~ "                                           vermeld staan in /etc/fstab\n"
+#~ "  %1$s [-p PRIORITEIT] [-d] [-v] [-f] NAAM    dit wisselgeheugen "
+#~ "inschakelen\n"
+#~ "  %1$s -s                                gebruikssamenvatting tonen\n"
+#~ "  %1$s -h                                deze hulptekst tonen\n"
+#~ "  %1$s -V                                programmaversie tonen\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gebruik:\n"
+#~ "  %1$s -a [-v]      alle wisselgeheugens uitschakelen\n"
+#~ "  %1$s [-v] NAAM    dit wisselgeheugen uitschakelen\n"
+#~ "  %1$s -h           deze hulptekst tonen\n"
+#~ "  %1$s -V           programmaversie tonen\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Gebruik:  %s [opties] <bestandsnaam>\n"
+#~ "\n"
+#~ "Opties:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gebruik:  %s [opties]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Gebruik:  %s [opties]\n"
+#~ "\n"
+#~ "Opties:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gebruik:  %s [opties] [bestand ...]\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14177,28 +14398,10 @@ msgstr "Invoerregel is te lang."
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "  -?, --help          deze hulptekst tonen"
 
-#~ msgid "dangerous options:"
-#~ msgstr "Gevaarlijke opties:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "  -g, --show-geometry     de kernelvisie van de geometrie weergeven"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "  -G, --show-pt-geometry  de uit de partitietabel afgeleide geometrie "
-#~ "weergeven"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "  -x, --show-extended     ook uitgebreide partities opnemen in de "
-#~ "uitvoer,\n"
-#~ "                          of beschrijvers ervan verwachten in de invoer"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14256,56 +14459,9 @@ msgstr "Invoerregel is te lang."
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "          getopt [opties] [--] optiereeks parameters\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "          getopt [opties] -o|--options optiereeks [opties] [--] "
-#~ "parameters\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              \n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr "  -a, --alternative             lange opties met één '-' toestaan\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                    deze hulptekst tonen\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=optiereeks  te herkennen lange opties\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=programmanaam      fouten rapporteren onder deze naam\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=optiereeks      te herkennen korte opties\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                   foutrapportage van getopt(3) uitzetten\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output            gewone uitvoer onderdrukken\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=shell             aanhalingsconventies van deze shell "
-#~ "gebruiken\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr ""
-#~ "  -T, --test                    bepalen of dit een verbeterde getopt(1) "
-#~ "is\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unquoted                de uitvoer niet aanhalen\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                 programmaversie tonen\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (verbeterde) 1.1.4\n"
 
diff --git a/po/pl.po b/po/pl.po
index de2e2ff85..e7b1eac67 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.19-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2011-01-30 09:01+0100\n"
 "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n"
 "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n"
@@ -105,29 +105,29 @@ msgstr "ponowne odczytanie tablicy partycji"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "pobranie rozmiaru w sektorach 512-bajtowych"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "nie mo�na otworzy� %s"
@@ -209,7 +209,7 @@ msgid "Verifying ... "
 msgstr "Weryfikacja... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Nie mo�na otworzy� pliku '%s'"
@@ -249,15 +249,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -270,7 +270,7 @@ msgstr "%s z pakietu %s\n"
 msgid "cannot stat file %s"
 msgstr "nie mo�na wykona� stat na urz�dzeniu %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, c-format
 msgid "%s: not a block device"
@@ -319,8 +319,8 @@ msgid "stat failed: %s"
 msgstr "stat nie powiod�o si�: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "otwarcie nie powiod�o si�: %s"
@@ -543,55 +543,55 @@ msgstr "niepoprawny offset danych pliku"
 msgid "compiled without -x support"
 msgstr "skompilowano bez obs�ugi -x"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "U�ycie: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s jest zamontowane.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Czy na pewno chcesz kontynuowa�"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "sprawdzanie przerwane.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Strefa nr < FIRSTZONE w pliku `%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Strefa nr >= ZONES w pliku `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Usun�� blok"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "B��d odczytu: nie uda�o si� ustawi� na blok w pliku '%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "B��d odczytu: wadliwy blok w pliku '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -600,295 +600,295 @@ msgstr ""
 "B��d wewn�trzny: pr�ba zapisu wadliwego bloku\n"
 "��danie zapisu zignorowane\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "przemieszczenie nie powiod�o si� we write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "B��d zapisu: wadliwy blok w pliku '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "przemieszczenie nie powiod�o si� we write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "nie uda�o si� zapisa� superbloku"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Nie mo�na zapisa� mapy i-w�z��w"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Nie mo�na zapisa� mapy stref"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Nie mo�na zapisa� i-w�z��w"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "przemieszczenie nie powiod�o si�"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "nie uda�o si� przydzieli� bufora dla superbloku"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "nie mo�na odczytac superbloku"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "b��dna liczba magiczna w superbloku"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Wspierane s� tylko bloki/strefy 1k"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "b��dne pole s_imap_blocks w superbloku"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "b��dne pole s_zmap_blocks w superbloku"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Nie mo�na przydzieli� bufora dla mapy i-w�z��w"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Nie mo�na przydzieli� bufora dla mapy stref"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Nie mo�na przydzieli� bufora dla i-w�z��w"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Nie mo�na przydzieli� bufora dla licznika i-w�z��w"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Nie mo�na przydzieli� bufora dla licznika stref"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Nie mo�na odczyta� mapy i-w�z��w"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Nie mo�na odczyta� mapy stref"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Nie mo�na odczyta� i-w�z��w"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Uwaga: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld i-w�z��w\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blok�w\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonesize=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxsize=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stan systemu plik�w=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "namelen=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 "I-w�ze� %d oznaczono jako nieu�ywany ale jest on u�ywany przez plik '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Znacznik w u�yciu"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Plik `%s' ma tryb %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Uwaga: liczba i-w�z��w za du�a.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "g��wny i-w�ze� nie jest katalogiem"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok by� wcze�niej u�yty. Obecnie w pliku `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Wyczy�ci�"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d w pliku `%s' jest oznaczony jako nieu�ywany."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Naprawi�"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Katalog '%s' zawiera b��dny numer i-w�z�a dla pliku '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Usun��"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: b��dny katalog: '.' nie jest na pocz�tku\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: b��dny katalog: '..' nie jest na drugiej pozycji\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "b��d wewn�trzny"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: b��dny katalog: rozmiar < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "przemieszczenie nie powiod�o si� w bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Tryb i-w�z�a %d nie wyczyszczony."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "I-w�ze� %d jest nieu�ywany, a zaznaczony jako u�ywany w mapie bitowej."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "I-w�ze� %d jest u�ywany, a zaznaczony jako nieu�ywany w mapie bitowej."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Ustawi�"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "I-w�ze� %d (tryb = %07o), i_nlinks=%d, obliczono=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Ustawienie i_nlinks na liczb� obliczon�"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Strefa %d: zaznaczona jako u�ywana, a �aden plik jej nie u�ywa."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Odznaczy�"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Strefa %d: u�ywana, naliczono=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Strefa %d: nie u�ywana, naliczono=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "b��dny rozmiar i-w�z�a"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "b��dny rozmiar i-w�z�a v2"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "do interakcyjnej naprawy potrzebny jest terminal"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "nie mo�na otworzy� '%s': %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s jest czysty, bez sprawdzania.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Wymuszenie sprawdzanie systemu plik�w na %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "System plik�w %s nie jest czysty, wymaga sprawdzenia.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -897,12 +897,12 @@ msgstr ""
 "\n"
 "%6ld u�ywanych i-w�z��w (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld u�ywanych stref (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -925,7 +925,7 @@ msgstr ""
 "------\n"
 "%6d plik�w\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1051,7 +1051,7 @@ msgstr "za du�o i-w�z��w - maksimum to 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "za ma�o miejsca, potrzeba co najmniej %llu blok�w"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Urz�dzenie: %s\n"
@@ -1223,10 +1223,8 @@ msgstr "%6.2f%% (%+ld bajt�w)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"B��d podczas zamykania pliku\n"
+msgid "cannot close file %s"
+msgstr "Nie mo�na otworzy� pliku '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1336,88 +1334,98 @@ msgstr ""
 "UWAGA: numery urz�dze� skr�cone do %u bit�w. Prawie na pewno oznacza to, �e\n"
 "kt�re� pliku urz�dze� b�d� niew�a�ciwe.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Sk�adnia: %s [-c | -l plik] [-nXX] [-iXX] /dev/nazwa [bloki]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s jest zamontowany; odmowa utworzenia tam systemu plik�w!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "przemieszczenie na blok rozruchowy nie powiod�o si� we write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "nie uda�o si� wyczy�ci� sektora rozruchowego"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "przemieszczenie nie powiod�o si� we write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "nie uda�o si� zapisa� superbloku"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "nie uda�o si� zapisa� mapy i-w�z��w"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "nie uda�o si� zapisa� mapy stref"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "nie uda�o si� zapisa� i-w�z��w"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "przemieszczenie nie powiod�o si� we write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "zapis nie powi�d� si� we write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "za du�o wadliwych blok�w"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "za ma�o dobrych blok�w"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "nie uda�o si� przydzieli� bufora dla superbloku"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "nie uda�o si� przydzieli� bufor�w dla map"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "nie uda�o si� przydzieli� bufora dla i-w�z��w"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld i-w�z��w\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blok�w\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1426,97 +1434,97 @@ msgstr ""
 "Maxsize=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "przemieszczenie nie powiod�o si� podczas sprawdzania blok�w"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Dziwna warto�� w do_check: prawdopodobnie b��dy\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "przemieszczenie nie powiod�o si� w check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "wadliwe bloki przed obszarem danych: nie mo�na utworzy� systemu plik�w"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d wadliwych blok�w\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "jeden wadliwy blok\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "nie mo�na otworzy� pliku z wadliwymi blokami"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "b��dny numer wadliwego bloku w linii %d\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "nie mo�na odczyta� pliku wadliwych blok�w"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "b��dny rozmiar i-w�z�a"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "b��d strtol: nie podano liczby blok�w"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: stat nie powi�d� si�"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: nie uda�o si� otworzy�"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: urz�dzenie jest zaj�te"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "rozmiar bloku mniejszy ni� rozmiar fizycznego sektora na %s"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "nie mo�na okre�li� rozmiaru %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "odmowa utworzenia systemu plik�w na '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "liczba blok�w zbyt ma�a"
@@ -1852,7 +1860,7 @@ msgstr "etykieta jest zbyt d�uga. Obci�to do '%s'"
 msgid "%s: failed to write label"
 msgstr "%s: nie uda�o si� zapisa� etykiety"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2203,7 +2211,7 @@ msgid "   Logical"
 msgstr "   Logiczna"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -2864,12 +2872,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Polecenie dla etykiety dysku BSD (m wy�wietla pomoc): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Pierwszy %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Ostatni %s albo +rozmiar, +rozmiarM lub +rozmiarK"
@@ -3015,7 +3023,7 @@ msgid "tracks/cylinder"
 msgstr "�cie�ek/cylinder"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cylindr�w"
 
@@ -3082,12 +3090,12 @@ msgstr "Utworzono ju� maksymaln� liczb� partycji\n"
 msgid "This partition already exists.\n"
 msgstr "Ta partycja ju� istnieje.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Uwaga: za du�o partycji (%d, maksimum to %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3306,7 +3314,7 @@ msgstr "Trzeba wprowadzi� liczb�"
 msgid "heads"
 msgstr "g�owic"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektor�w"
 
@@ -3752,7 +3760,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Rozruch   Pocz�tek      Koniec   Blok�w   ID  System\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Urz�dzenie"
 
@@ -3839,7 +3847,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "Pozosta�o %lld nieprzydzielonych sektor�w %d-bajtowych\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3996,37 +4004,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Synchronizacja dysk�w.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partycja %d nie ma obszaru danych\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nowy pocz�tek danych"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Polecenie eksperta (m wy�wietla pomoc): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Liczba cylindr�w"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Liczba g�owic"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Liczba sektor�w"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Uwaga: ustawianie offsetu sektora dla kompatybilno�ci z DOS-em\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4039,32 +4047,32 @@ msgstr ""
 "nie obs�uguje GPT. Nale�y u�y� GNU Parteda.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Dysk %s nie zawiera poprawnej tablicy partycji\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Nie mo�na otworzy� %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "nie mo�na otworzy� %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: nieznane polecenie\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "J�dro samo rozpoznaje rozmiar sektora - opcja -b zignorowana\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4073,16 +4081,16 @@ msgstr ""
 "Uwaga: opcja -b (rozmiar sektora) powinna by� u�ywana z okre�lonym "
 "urz�dzeniem\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Na %s wykryto etykiet� dysku OSF/1, wej�cie w tryb etykiety dysku\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Polecenie (m wy�wietla pomoc): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4091,16 +4099,16 @@ msgstr ""
 "\n"
 "Obecny plik rozruchowy to: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Prosz� wpisa� nazw� nowego pliku rozruchowego: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Plik rozruchowy pozosta� bez zmian\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4419,9 +4427,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tWybrano niestandardow� nazw� pliku rozruchowego.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Mo�na zmieni� znacznik tylko dla niepustych partycji.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Niestety tylko superu�ytkownik mo�e zmieni� zegar systemowy.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4437,7 +4445,7 @@ msgstr ""
 "dysku \"SGI volume\" mo�e by� niezgodna z tym zaleceniem.\n"
 "Prosz� wpisa� TAK, je�li na pewno ta partycja ma by� oznaczona inaczej.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "TAK\n"
 
@@ -4638,7 +4646,7 @@ msgstr "Nieu�ywany odst�p - sektory 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Nieu�ywany odst�p - sektory %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4647,7 +4655,7 @@ msgstr ""
 "Inne partycje ju� pokrywaj� ca�y dysk.\n"
 "Najpierw trzeba co� usun��/zmniejszy�.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4656,12 +4664,12 @@ msgstr ""
 "Zdecydowanie zaleca si�, aby trzecia partycja pokrywa�a ca�y dysk\n"
 "i by�a typu `Ca�y dysk'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d jest ju� przydzielony\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4671,7 +4679,7 @@ msgstr ""
 "Nie pokryto ca�ego dysku trzeci� partycj�, ale warto�� %d %s\n"
 "pokrywa inn� partycj�. Wpis zosta� zmieniony na %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4680,7 +4688,7 @@ msgstr ""
 "Aby zachowa� kompatybilno�� z SunOS-em/Solarisem, najlepiej pozostawi�\n"
 "t� partycj� jako ca�y dysk (5), zaczynaj�c� si� od 0, o %u sektorach\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4694,7 +4702,7 @@ msgstr ""
 "rozruchowy. Prosz� wpisa� TA, je�li na pewno ta partycja ma\n"
 "mie� typ 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4715,7 +4723,7 @@ msgstr ""
 "Jednostka: %s, czyli %d * 512 bajt�w\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4728,28 +4736,28 @@ msgstr ""
 "Jednostka: %s, czyli %d * 512 bajt�w\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flaga   Pocz�tek    Koniec Blok�w   Id  System\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Liczba zmiennych cylindr�w"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Dodatkowych sektor�w na cylinder"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Wsp�czynnik przeplotu"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Pr�dko�� obrotowa (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Liczba fizycznych cylindr�w"
 
@@ -5204,7 +5212,7 @@ msgstr "Dysk %s: nie mo�na pobra� geometrii\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Dysk %s: nie mo�na pobra� rozmiaru\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5215,22 +5223,22 @@ msgstr ""
 "U�ywanie na niej fdiska prawdopodobnie nic nie da.\n"
 "[Je�li naprawd� o to chodzi - prosz� u�y� opcji --force]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Uwaga: HDIO_GETGEO twierdzi, �e liczba g�owic to %lu\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Uwaga: HDIO_GETGEO twierdzi, �e liczba sektor�w to %lu\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Uwaga: BLKGETSIZE/HDIO_GETGEO twierdzi, �e liczba cylindr�w to %lu\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5240,7 +5248,7 @@ msgstr ""
 "Spowoduje to problemy z ka�dym oprogoramowaniem u�ywaj�cym adresowania C/H/"
 "S.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5249,14 +5257,14 @@ msgstr ""
 "\n"
 "Dysk %s: cylindr�w: %lu, g�owic: %lu, sektor�w na �cie�ce: %lu\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 "%s dla partycji %s ma niemo�liw� liczb� g�owic: %lu (powinna by� 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5264,7 +5272,7 @@ msgid ""
 msgstr ""
 "%s dla partycji %s ma niemo�liw� liczb� sektor�w: %lu (powinna by� 1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5272,7 +5280,7 @@ msgid ""
 msgstr ""
 "%s dla partycji %s ma niemo�liw� liczb� cylindr�w: %lu (powinna by� 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5281,12 +5289,12 @@ msgstr ""
 "Id  Nazwa\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Ponowny odczyt tablicy partycji...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5296,26 +5304,26 @@ msgstr ""
 "Przed mkfs nale�y uruchomi� partprobe(8), kpartx(8) lub\n"
 "zrestartowa� system.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "B��d zamykania %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: nie ma takiej partycji\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "nierozpoznany format - u�ycie sektor�w\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "format niezaimplementowany - u�ycie %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5324,12 +5332,12 @@ msgstr ""
 "Jednostka = cylindry, czyli %lu bajt�w, bloki 1024-bajtowe liczone od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "  Urz�dz.Rozr. Pocz�tek Koniec #cyl.    #blok�w   Id  System\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5338,12 +5346,12 @@ msgstr ""
 "Jednostka = sektory 512-bajtowe, liczone od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "  Urz�dz. Rozruch Pocz�tek   Koniec #sektor�w Id  System\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5352,12 +5360,12 @@ msgstr ""
 "Jednostka = bloki 1024-bajtowe, liczone od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "  Urz�dz.Rozruch Pocz�tek    Koniec #blok�w   Id  System\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5366,32 +5374,32 @@ msgstr ""
 "Jednostka = mebibajty (1048576 bajt�w), bloki 1024-bajtowe, liczone od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "  Urz�dz.Rozr. Pocz.   Koniec MiB    #blok�w   Id  System\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tpocz�tek: (c,h,s) oczekiwane (%ld,%ld,%ld), otrzymano (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tend: (c,h,s) oczekiwane (%ld,%ld,%ld), otrzymano (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partycja ko�czy si� na cylindrze %ld, za ko�cem dysku\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Nie znaleziono �adnej partycji\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5402,51 +5410,41 @@ msgstr ""
 "  dla C/H/S=*/%ld/%ld (zamiast %ld/%ld/%ld).\n"
 "Dla tego listingu za�o�ono t� geometri�.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "tablica partycji nie istnieje.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "dziwne, zdefiniowano tylko %d partycji.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Uwaga: partycja %s ma rozmiar 0, ale nie jest zaznaczona jako pusta\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Uwaga: partycja %s ma rozmiar 0, a jest rozruchowa\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Uwaga: partycja %s ma rozmiar 0 i niezerowy pocz�tek\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Uwaga: partycja %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "nie zawiera si� w partycji %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Uwaga: partycje %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "i %s zachodz� na siebie\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Uwaga: partycja %d jest pusta\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5455,17 +5453,17 @@ msgstr ""
 "Uwaga: partycja %s zawiera cz�� tablicy partycji (sektor %lu)\n"
 "i zostanie zniszczona po jej wype�nieniu\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Uwaga: partycja %s zaczyna si� od sektora 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Uwaga: partycja %s wystaje za koniec dysku\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5473,17 +5471,17 @@ msgstr ""
 "Spo�r�d partycji g��wnych najwy�ej jedna mo�e by� rozszerzona\n"
 " (jednak�e nie jest to problemem pod Linuksem)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Uwaga: partycja %s nie zaczyna si� na granicy cylindra\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Uwaga: partycja %s nie ko�czy si� na granicy cylindra\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5492,7 +5490,7 @@ msgstr ""
 "(aktywna). Dla LILO nie ma to znaczenia, ale DOS-owy MBR nie uruchomi\n"
 "systemu z tego dysku.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5500,7 +5498,7 @@ msgstr ""
 "Uwaga: zwykle mo�na uruchomi� system tylko z partycji g��wnych.\n"
 "LILO nie bierze pod uwag� flagi rozruchu.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5509,11 +5507,11 @@ msgstr ""
 "Nie ma to znaczenia dla LILO, ale DOS-owy MBR nie uruchomi systemu z tego\n"
 "dysku.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "pocz�tek"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5521,23 +5519,23 @@ msgstr ""
 "partycja %s: pocz�tek: (c,h,s) oczekiwane (%ld,%ld,%ld), otrzymano (%ld,%ld,"
 "%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "koniec"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partycja %s: koniec: (c,h,s) oczekiwane (%ld,%ld,%ld), otrzymano (%ld,%ld,"
 "%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partycja %s ko�czy si� na cylindrze %ld, za ko�cem dysku\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5546,7 +5544,7 @@ msgstr ""
 "Uwaga: przesuni�to pocz�tek partycji rozszezronej z %ld na %ld\n"
 "(tylko na potrzeby listy - bez zmiany zawarto�ci).\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5554,131 +5552,131 @@ msgstr ""
 "Uwaga: partycja rozszerzona nie zaczyna si� na granicy cylindra.\n"
 "DOS i Linux inaczej zinterpretuj� jej zawarto��.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "zbyt du�o partycji - zignorowano przekraczaj�ce nr %d\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "drzewo partycji?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "wykryto Disk Manager - program nie mo�e tego obs�u�y�\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "wykryto sygnatur� DM6 - poddaj� si�\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "dziwne... partycja rozszerzona rozmiaru 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "dziwne... partycja BSD rozmiaru 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: nierozpoznany typ tablicy partycji\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "podano flag� -n: bez zmian\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Nie uda�o si� zapisa� starych sektor�w - przerwano\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Nie uda�o si� zapisa� partycji na %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "d�uga lub niekompletna linia na wej�ciu - zako�czenie\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "b��d wej�cia: oczekiwano `=' po polu %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "b��d wej�cia: oczekiwano znaku %c po polu %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "nierozpoznane wej�cie: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "liczba zbyt du�a\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "ko�cowe �mieci po liczbie\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "brak miejsca na deskryptor partycji\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "nie mo�na zbudowa� otaczaj�cej partycji rozszerzonej\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "zbyt du�o p�l wej�ciowych\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Brak miejsca na wi�cej\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Niedozwolony typ\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Uwaga: podany rozmiar (%lu) przekracza maksymalny dopuszczalny (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Uwaga: pusta partycja\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Uwaga: b��dny pocz�tek partycji (najbli�szy %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "nierozpoznana flaga rozruchu - prosz� wybra� - lub *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "cz�ciowa specyfikacja c,h,s?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Partycja rozszerzona nie tam, gdzie jej oczekiwano\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "b��dne wej�cie\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "zbyt du�o partycji\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5689,103 +5687,184 @@ msgstr ""
 "<pocz�tek> <rozmiar> <typ [E,S,L,X,hex]> <rozruch [-,*> <c,h,s> <c,h,s>\n"
 "Zwykle trzeba poda� tylko <pocz�tek> i <rozmiar> (oraz ewentualnie <typ>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
+msgstr "Sk�adnia:\n"
+
+#: fdisk/sfdisk.c:2332
+#, fuzzy, c-format
+msgid " %s [options] <device> [...]\n"
 msgstr ""
 "\n"
 "Sk�adnia:\n"
 " %s [opcje] [<urz�dzenie> ...]\n"
 
-#: fdisk/sfdisk.c:2355
-#, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "urz�dzenie: co� w stylu /dev/hda lub /dev/sda"
-
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Opcje:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "niebezpieczne opcje:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [lub --show-pt-geometry]: wypisanie geometrii odgadni�tej z tabl. "
+"part."
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [lub --show-extended]: wypisywanie tak�e partycji rozszerzonych\n"
+"                              lub oczekiwanie ich deskryptor�w na wej�ciu"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Sk�adnia:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s urz�dzenie\t\t wypisanie aktywnych partycji na urz�dzeniu\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s urz�dzenie n1 n2 ... uaktywnienie partycji n1 ..., wy��czenie reszty\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An urz�dzenie\t uaktywnienie partycji n, wy��czenie pozosta�ych\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5798,62 +5877,62 @@ msgstr ""
 "Narz�dzie sfdisk nie obs�uguje GPT. Nale�y u�y� GNU Parteda.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Aby wy��czy� ten test, nale�y u�y� flagi --force.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "brak polecenia?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "razem: %llu blok�w\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Sk�adnia: sfdisk --print-id urz�dzenie numer-partycji\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Sk�adnia: sfdisk --change-id urz�dzenie numer-partycji ID\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Sk�adnia: sfdisk --id urz�dzenie numer-partycji [ID]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "mo�na okre�li� tylko jedno urz�dzenie (chyba �e z -l lub -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "nie mo�na otworzy� %s do odczytu i zapisu\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "nie mo�na otworzy� %s do odczytu\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: cylindr�w: %ld, g�owic: %ld, sektor�w na �cie�ce: %ld\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Nie mo�na pobra� rozmiaru %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "b��dny bajt ruzruchu: 0x%x zamiast 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5861,7 +5940,7 @@ msgstr ""
 "Gotowe\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5870,35 +5949,35 @@ msgstr ""
 "Na dysku s� %d aktywne partycje g��wne. Nie ma to znaczenia dla LILO,\n"
 "ale DOS-owy MBR potrafi uruchomi� dysk tylko z jedn� aktywn� partycj�.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partycja %s ma ID %x i nie jest ukryta\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "B��dny ID %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Ten dysk jest aktualnie u�ywany.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "B��d krytyczny: nie mo�na odnale�� %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uwaga: %s nie jest urz�dzeniem blokowym\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Sprawdzanie czy nikt nie u�ywa teraz tego dysku...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5912,30 +5991,30 @@ msgstr ""
 "z tego dysku.\n"
 "Aby pomin�� ten test, mo�na u�y� flagi --no-reread.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Mo�na u�y� flagi --force, aby pomin�� wszystkie testy.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Stara sytuacja:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partycja %d nie istnieje, nie mo�na jej zmieni�\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Nowa sytuacja:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5943,21 +6022,21 @@ msgstr ""
 "Nie podobaj� mi si� te partycje - nie zmieniono\n"
 "(je�li na pewno tak maj� wygl�da� - prosz� u�y� opcji --force).\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Nie podoba mi si� to - prawdopodobnie nale�y odpowiedzie� Nie\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Czy te zmiany s� satysfakcjonuj�ce? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Czy zapisa� zmiany na dysk [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5966,16 +6045,16 @@ msgstr ""
 "\n"
 "sfdisk: przedwczesny koniec wej�cia\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Wyj�cie - bez zmian\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Prosz� odpowiedzie� jednym z y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5984,7 +6063,7 @@ msgstr ""
 "Zapisano now� tablic� partycji\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6016,25 +6095,27 @@ msgstr "Blokowanie dysku %s... "
 msgid "(waiting) "
 msgstr "(oczekiwanie) "
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr "sukces"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s powiod�o si�.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 msgid "failed"
 msgstr "nie powiod�o si�"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "UWAGA: nie uda�o si� otworzy� %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "UWAGA: b��dny format w linii %d z %s\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -6046,37 +6127,37 @@ msgstr ""
 "\tjak najszybciej.\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: nie znaleziono\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s: wait: Brak procesu potomnego?!\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "Uwaga... %s dla urz�dzenia %s zako�czone sygna�em %d.\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s %s: status to %x, to nie powinno si� nigdy zdarzy�.\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Zako�czono %s (kod wyj�cia %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: B��d %d podczas wywo�ywania fsck.%s dla %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6085,7 +6166,7 @@ msgstr ""
 "Albo wszystkie, albo �aden z typ�w przekazanych opcji -t musi by�\n"
 "poprzedzony 'no' lub '!'.\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
@@ -6093,12 +6174,12 @@ msgstr ""
 "%s: pomini�to b��dn� lini� w /etc/fstab: montowanie typu bind z niezerowym "
 "numerem przebiegu fsck\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: pomini�to nieistniej�ce urz�dzenie\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
@@ -6107,21 +6188,21 @@ msgstr ""
 "%s: urz�dzenie nie istnieje (mo�na u�y� opcji fstaba \"nofail\" do "
 "pomini�cia tego urz�dzenia)\n"
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck: nie mo�na sprawdzi� %s: nie znaleziono fsck.%s\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "Sprawdzanie wszystkich system�w plik�w.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--oczekiwanie-- (przebieg %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6131,58 +6212,58 @@ msgstr ""
 "\n"
 "Sk�adnia: %s [opcje] [plik ...]\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: za du�o urz�dze�\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Nie mo�na otworzy� %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "Czy /proc jest zamontowany?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Trzeba by� rootem, aby znale�� pasuj�ce systemy plik�w: %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Nie uda�o si� odnale�� pasuj�cego systemu plik�w: %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: zbyt du�o argument�w\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 #, fuzzy
 msgid "the -l option can be used with one device only -- ignore"
 msgstr "%s: opcji -l mo�na u�y� tylko z jednym urz�dzeniem - zignorowano\n"
@@ -6202,33 +6283,82 @@ msgstr "pusta opcja d�uga po opcji -l lub --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "nieznana pow�oka po opcji -s lub --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [opcje] -o|--options optstring [opcje] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Zezwolenie na d�ugie opcje z jednym - na "
+"pocz�tku\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Ten kr�tki opis u�ycia\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
 msgstr ""
+"  -l, --longoptions=opcje      D�ugie opcje, jakie maj� by� rozpoznawane\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=program           Nazwa z jak� maj� by� zg�aszane b��dy\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr ""
+"  -o, --options=optstring      Kr�tkie opcje, jakie maj� by� rozpoznawane\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Wy��czenie komunikat�w b��d�w z getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Bez standardowego wyj�cia\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=pow�oka          Ustawienie konwencji cytowania pow�oki\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Sprawdzenie wersji getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unquote                Bez cytowania wyj�cia\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Wypisanie informacji o wersji\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "brak parametru optstring"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "b��d wewn�trzny, prosz� skontaktowa� si� autorem."
 
@@ -6696,70 +6826,88 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Nie uda�o si� ustawi� warto�ci epoch w j�drze.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Opcje:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
@@ -6767,22 +6915,22 @@ msgstr ""
 "(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Nie mo�na po��czy� si� z systemem audytu\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "niezrozumia�y pid"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s nie przyjmuje argument�w nie b�d�cych opcjimi. Podano %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6791,14 +6939,14 @@ msgstr ""
 "Podano wiele funkcji.\n"
 "Jednorazowo mo�na wykona� tylko jedn�.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr "%s: Opcje --utc i --localtime wykluczaj� si� wzajemnie. Podano obie.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6806,7 +6954,7 @@ msgid ""
 msgstr ""
 "%s: Opcje --adjust i --noadjfile wykluczaj� si� wzajemnie. Podano obie.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6814,29 +6962,29 @@ msgid ""
 msgstr ""
 "%s: Opcje --adjfile i --noadjfile wykluczaj� si� wzajemnie. Podano obie.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: W przypadku u�ycia --noadjfile trzeba poda� --utc lub --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 "Brak zdatnego do u�ycia czasu do ustawienia. Nie mo�na ustawi� zegara.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Niestety tylko superu�ytkownik mo�e zmieni� zegar sprz�towy.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Niestety tylko superu�ytkownik mo�e zmieni� zegar systemowy.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6844,12 +6992,12 @@ msgstr ""
 "Niestety tylko superu�ytkownik mo�e zmieni� warto�� epoch zegara sprz�towego "
 "w j�drze.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "Nie mo�na uzyska� dost�pu do zegara sprz�towego �adn� znan� metod�.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7033,7 +7181,7 @@ msgid "failed to read mtab"
 msgstr "nie uda�o si� odczyta�: %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr "nie uda�o si� zainicjowa� iteratora libmount"
 
@@ -7080,87 +7228,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
-"\n"
-"Opcje:\n"
-" -a, --all               zamontowanie wszystkich system�w plik�w z fstaba\n"
-" -f, --fake              pusty przebieg, pomini�cie wywo�a� mount(2)\n"
-" -F, --fork              osobny proces dla ka�dego urz�dzenia (z opcj� -a)\n"
-" -h, --help              ten opis\n"
-" -n, --no-mtab           bez zapisu do /etc/mtab\n"
-" -r, --read-only         montowanie tylko do odczytu (to samo, co -o ro)\n"
-" -v, --verbose           tryb ze szczeg�owymi komunikatami\n"
-" -V, --version           wypisanie informacji o wersji\n"
-" -w, --read-write        montowanie do odczytu i zapisu (domy�lne)\n"
-" -o, --options <lista>   rozdzielone przecinkami opcje montowania\n"
-" -O, --test-opts <lista> ograniczenie zbioru system�w plik�w (z opcj� -a)\n"
-" -t, --types <lista>     okre�lenie typu systemu plik�w\n"
-" -c, --no-canonicalize   bez normalizowania �cie�ek\n"
-" -i, --internal-only     bez wywo�ywania program�w pomocniczych mount.<typ>\n"
-" -l, --show-labels       lista wszystkich montowa� z etykietami\n"
-"\n"
-"�r�d�o:\n"
-" -L, --label <etykieta>  synonim LABEL=<etykieta>\n"
-" -U, --uuid <uuid>       synonim UUID=<uuid>\n"
-" LABEL=<etykieta>        okre�lenie urz�dzenia po etykiecie systemu plik�w\n"
-" UUID=<uuid>             okre�lenie urz�dzenia po UUID-ie systemu plik�w\n"
-" <urz�dzenie>            okre�lenie urz�dzenia po �cie�ce\n"
-" <katalog>               punkt montowania dla montowa� bind (p. --bind/"
-"rbind)\n"
-" <plik>                  zwyk�y plik do utworzenia urz�dzenia loop\n"
-"\n"
-"Operacje:\n"
-" -B, --bind              zamontowanie poddrzewa gdzie� indziej (syn. -o "
-"bind)\n"
-" -M, --move              przeniesienie poddrzewa w inne miejsce\n"
-" -R, --rbind             zamontowaie poddrzewa wraz z montowaniami wewn�trz\n"
-" --make-shared           uczynienie poddrzewa wsp�dzielonym\n"
-" --make-slave            uczynienie poddrzewa podporz�dkowanym\n"
-" --make-private          uczynienie poddrzewa prywatnym\n"
-" --make-unbindable       uczynienie poddrzewa niedost�pnym dla opcji bind\n"
-" --make-rshared          rekurencyjne uczynienie poddrzewa wsp�dzielonym\n"
-" --make-rslave           rekurencyjne uczynienie poddrzewa podporz�dkowanym\n"
-" --make-rprivate         rekurencyjne uczynienie poddrzewa prywatnym\n"
-" --make-runbindable      rekurencyjne uczynienie poddrzewa niedost�pnym dla "
-"bind\n"
-
-#: libmount/samples/mount.c:243
+
+#: libmount/samples/mount.c:250
 #, c-format
 msgid ""
 "\n"
@@ -7169,25 +7315,25 @@ msgstr ""
 "\n"
 "Wi�cej informacji w mount(8).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr "przydzielenie kontekstu libmount nie powiod�o si�"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 msgid "failed to append options"
 msgstr "nie uda�o si� do��czy� opcji"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 msgid "failed to set options pattern"
 msgstr "nie uda�o si� ustawi� wzorca opcji"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 #, fuzzy
 msgid "only one <source> may be specified"
 msgstr "mo�na poda� tylko jedno <�r�d�o>"
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 msgid "failed to allocate source buffer"
 msgstr "nie uda�o si� przydzieli� bufora dla �r�d�a"
 
@@ -7272,7 +7418,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: niepowodzenie PAM, przerwano: %s"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Has�o: "
 
@@ -7707,46 +7853,47 @@ msgstr "NADMIAROWE ko�ce linii"
 msgid "too many bare linefeeds."
 msgstr "zbyt du�o pustych linii."
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr "przekroczony limit czasu logowania (sekund: %d)"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Ostatnie logowanie: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "z %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "na %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 msgid "write lastlog failed"
 msgstr "zapis wpisu lastlog nie powi�d� si�"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "B��DNE LOGOWANIE Z %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "B��DNE LOGOWANIE NA %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d B��DNYCH LOGOWA� Z %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d B��DNYCH LOGOWA� NA %s, %s"
@@ -7771,7 +7918,7 @@ msgstr "brak uprawnie�"
 msgid "setuid failed"
 msgstr "setuid nie powiod�o si�"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "exec %s nie powiod�o si�"
@@ -7816,8 +7963,8 @@ msgstr "%s: nie mo�na ustawi� kontekstu dla %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: nie mo�na odblokowa� %s: %s (zmiany s� nadal w %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "wywo�anie fork nie powiod�o si�"
 
@@ -7869,24 +8016,21 @@ msgstr "niedozwolona warto�� roku: dopuszczalne to 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Sk�adnia: %s [-13smjyV] [[[dzie�] miesi�c] rok]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7996,32 +8140,32 @@ msgstr " Usun��"
 msgid "failed to add line to output"
 msgstr "nie uda�o si� doda� linii do wyj�cia"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, c-format
 msgid "%s: parse error at line %d"
 msgstr "%s: b��d sk�adni w linii %d"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "nie uda�o si� zainicjowa� tablicy libmount"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "nie mo�na odczyta� %s."
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "nie uda�o si� zainicjowa� tablicy libmount"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc nie powiod�o si�"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8038,71 +8182,67 @@ msgstr ""
 " %1$s [opcje] <urz�dzenie> <punkt_montowania>\n"
 " %1$s [opcje] [--source <urz�dzenie>] [--target <punkt_montowania>]\n"
 
-#: misc-utils/findmnt.c:770
-#, fuzzy, c-format
+#: misc-utils/findmnt.c:772
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
-"\n"
-"Opcje:\n"
-" -s, --fstab            szukanie w statycznej tablicy system�w plik�w\n"
-" -m, --mtab             szukanie w tablicy zamontowanych system�w plik�w\n"
-" -k, --kernel           szukanie w tablicy zamontowanych system�w plik�w\n"
-"                        w j�drze (domy�lne)\n"
-"\n"
-" -c, --canonicalize     wypisywanie �cie�ek w postaci kanonicznej\n"
-" -d, --direction <typ>  kierunek wyszukiwania - 'forward' lub 'backward'\n"
-" -e, --evaluate         wypisanie wszystkich znanych znacznik�w (LABEL/"
-"UUID)\n"
-" -f, --first-only       wypisanie tylko pierwszego znalezionego systemu "
-"plik�w\n"
-" -h, --help             wy�wietlenie tego opisu\n"
-" -i, --invert           odwr�cenie dopasowania\n"
-" -l, --list             wyj�cie w postaci listy\n"
-" -n, --noheadings       bez wypisywania nag��wk�w\n"
-" -u, --notruncate       bez skracania tekstu w kolumnach\n"
-" -O, --options <lista>  ograniczenie zbioru system�w plik�w wg opcji mounta\n"
-" -o, --output <lista>   wypisywanie kolumn\n"
-" -r, --raw              wyj�cie w postaci surowej\n"
-" -a, --ascii            u�ycie znak�w ASCII do formatowania drzewa\n"
-" -t, --types <lista>    ograniczenie zbioru system�w plik�w wg typu FS\n"
-" -v, --nofsroot         bez wypisywania [/dir] dla montowa� bind i btrfs\n"
-" -R, --submounts        wypisanie wszystkich montowa� poni�ej (submount)\n"
-"                        dla pasuj�cych system�w plik�w\n"
-" -S, --source <�a�cuch> urz�dzenie, LABEL= lub UUID=urz�dzenie\n"
-" -T, --target <�a�cuch> punkt montowania\n"
-"\n"
-
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, c-format
 msgid ""
 "\n"
@@ -8111,7 +8251,7 @@ msgstr ""
 "\n"
 "Dost�pne kolumny:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
@@ -8120,21 +8260,21 @@ msgstr ""
 "\n"
 "Wi�cej informacji w findmnt(1).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr "opcje wykluczaj� si� wzajemnie"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr "nieznany kierunek '%s'"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "nie uda�o si� przeanalizowa� warto�ci time_t"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
@@ -8142,20 +8282,20 @@ msgstr ""
 "opcji --target i --source nie mo�na u�ywa� jednocze�nie z elementem "
 "polecenia, kt�ry nie jest opcj�"
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr "nie uda�o si� zainicjowa� pami�ci podr�cznej libmount"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr "nie uda�o si� zainicjowa� tabeli wyj�ciowej"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr "nie uda�o si� zainicjowa� kolumny wyj�ciowej"
 
@@ -8179,12 +8319,12 @@ msgstr "%s: nie znaleziono procese \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: nieznany sygna� %s; poprawne sygna�y:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Sk�adnia: %s [ -s sygna� | -p ] [ -a ] PID ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "          %s -l [ sygna� ]\n"
@@ -8204,87 +8344,86 @@ msgstr "socket: %s.\n"
 msgid "connect %s"
 msgstr "connect: %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "connect"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Nast�pny plik: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "niezrozumia�y priorytet"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Warto�� spoza zakresu.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: nieznana nazwa kategorii: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: nieznana nazwa priorytetu: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje] [plik ...]\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8418,8 +8557,8 @@ msgid "failed to open device directory in sysfs"
 msgstr "nie uda�o si� otworzy� katalogu urz�dzenia w sysfs"
 
 #: misc-utils/lsblk.c:792
-#, c-format
-msgid "%s: failed to get whole-list devno"
+#, fuzzy, c-format
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: nie uda�o si� pobra� pe�nej listy devno"
 
 #: misc-utils/lsblk.c:809
@@ -8437,12 +8576,13 @@ msgstr "%s: nie uda�o si� odczyta� dowi�zania"
 msgid "failed to parse list '%s'"
 msgstr "nie uda�o si� przeanalizowa� listy '%s'"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr "lista wykluczonych urz�dze� zbyt d�uga (limit liczby urz�dze� to %d)"
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, c-format
 msgid ""
 "\n"
@@ -8453,7 +8593,7 @@ msgstr ""
 "Sk�adnia:\n"
 " %s [opcje] [<urz�dzenie> ...]\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8494,7 +8634,7 @@ msgstr ""
 " -r, --raw             surowy format wyj�cia\n"
 " -t, --topology        wypisanie informacji o topologii\n"
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
@@ -8503,33 +8643,33 @@ msgstr ""
 "\n"
 "Wi�cej informacji w lsblk(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Sk�adnia: %s [opcja]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Nie mo�na otworzy� %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Odebrano %d bajt�w od %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "uruchomienie %s nie powiod�o si�"
@@ -8549,26 +8689,15 @@ msgstr "nie uda�o si� wykona� stat na '%s'"
 msgid "%s - No such file or directory\n"
 msgstr "%s - nie ma takiego pliku ani katalogu\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje] �cie�ka [�cie�ka ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Opcje:\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8587,8 +8716,7 @@ msgstr ""
 " -n, --nosymlinks    bez pod��ania za dowi�zaniami symbolicznymi\n"
 " -v, --vertical      pionowe wyr�wnanie uprawnie� i w�a�cicieli\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8596,12 +8724,12 @@ msgstr ""
 "\n"
 "Wi�cej informacji w namei(1).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "Parametr --date zbyt d�ugi\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s: przekroczono limit dowi�za� symbolicznych"
@@ -8611,166 +8739,167 @@ msgstr "%s: przekroczono limit dowi�za� symbolicznych"
 msgid "renaming %s to %s failed"
 msgstr "%s: zmiana nazwy %s na %s nie powiod�a si�: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Sk�adnia: %s [opcje] urz�dzenie...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "b��dne argumenty"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "zapis"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "odczytany rozmiar"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "b��dna d�ugo�� odpowiedzi"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "Nie uda�o si� otworzy�/utworzy� %s: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "Nie uda�o si� zablokowa� %s: %s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "demon uuidd ju� dzia�a z pidem %s\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "Nie uda�o si� utworzy� gniazda uniksowego: %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Nie uda�o si� dowi�za� gniazda uniksowego %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Nie uda�o si� uruchomi� nas�uchiwania na gnie�dzie uniksowym %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "B��d odczytu od klienta, d�ugo�� = %d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "operacja %d, odebrana liczba = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr "operacja %d\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "Wygenerowany UUID czasowy: %s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "Wygenerowany UUID losowy: %s\n"
 
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "Wygenerowany UUID czasowy %s i %d kolejnych\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "Wygenerowany UUID czasowy %s i %d kolejnych\n"
+msgstr[1] "Wygenerowany UUID czasowy %s i %d kolejnych\n"
+msgstr[2] "Wygenerowany UUID czasowy %s i %d kolejnych\n"
 
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "Wygenerowane UUID-y w liczbie %d:\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "Wygenerowane UUID-y w liczbie %d:\n"
+msgstr[1] "Wygenerowane UUID-y w liczbie %d:\n"
+msgstr[2] "Wygenerowane UUID-y w liczbie %d:\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "Nieprawid�owa operacja %d\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "Nieoczekiwana d�ugo�� odpowiedzi od serwera %d\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "B��dna liczba: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "B��d wywo�ania demona uuidd (%s): %s\n"
 
-#: misc-utils/uuidd.c:546
-#, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s i kolejne UUID-y w liczbie %d\n"
+#: misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s i kolejne UUID-y w liczbie %d\n"
+msgstr[1] "%s i kolejne UUID-y w liczbie %d\n"
+msgstr[2] "%s i kolejne UUID-y w liczbie %d\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "Lista UUID-�w:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "Nie uda�o si� zabi� uuidd dzia�aj�cego z pidem %d: %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "Zabito uuidd dzia�aj�cego z pidem %d\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8778,31 +8907,30 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje] [plik ...]\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8835,29 +8963,31 @@ msgid "%s: write failed"
 msgstr "zapis nie powi�d� si�: %s"
 
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd bajt�w ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] usuni�to pod offsetem 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "podano b��dn� warto�� offsetu '%s'"
 
-#: misc-utils/wipefs.c:306
+#: misc-utils/wipefs.c:305
 #, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Sk�adnia: %s [opcje] urz�dzenie...\n"
+
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 " -a, --all           usuni�cie wszystkich �a�cuch�w magicznych (OSTRO�NIE!)\n"
 " -h, --help          wy�wietlenie tego opisu\n"
@@ -8865,7 +8995,7 @@ msgstr ""
 " -o, --offset <n>    offset do usuni�cia w bajtach\n"
 " -p, --parsable      wyj�cie w formacie do przetworzenia\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8874,11 +9004,11 @@ msgstr ""
 "\n"
 "Wi�cej informacji w wipefs(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "--offset i --all wykluczaj� si� wzajemnie"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr "obs�ugiwane jest tylko jedno urz�dzenie jako argument."
 
@@ -8969,63 +9099,63 @@ msgstr "b��d podczas zmiany w�a�ciciela pliku %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "nie mo�na zmieni� nazwy %s na %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: katalog /dev nie istnieje."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: nie mo�na ustawi� pojemno�ci urz�dzenia %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", offset %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", limit rozmiaru %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", szyfrowanie %s (typ %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", offset %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", typ szyfrowania %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: nie mo�na uzyska� informacji o urz�dzeniu %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: nie mo�na otworzy� urz�dzenia %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: brak uprawnie� do sprawdzenia /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: nie uda�o si� odnale�� �adnego wolnego urz�dzenia loop"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -9035,58 +9165,56 @@ msgstr ""
 "       nie obs�uguje urz�dze� loop? (je�li tak, nale�y je zrekompilowa�,\n"
 "       lub wykona� `modprobe loop'.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Brak pami�ci podczas odczytu has�a"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "uwaga: %s jest ju� zwi�zany z %s\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 "uwaga: %s: zabezpieczony przed zapisem, u�ycie trybu tylko do odczytu\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Nie uda�o si� zablokowa� w pami�ci, zako�czenie.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD nie powi�d� si�: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): sukces\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): sukces\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: nie mo�na usun�� urz�dzenia %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Ten program mount zosta� skompilowany bez obs�ugi urz�dze� loop. Prosz� "
 "przekompilowa�.\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9094,7 +9222,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Sk�adnia:\n"
@@ -9106,19 +9234,17 @@ msgstr ""
 " %1$s -j | --associated <plik> [-o <num>]     lista powi�zanych z <plikiem>\n"
 " %1$s [ opcje ] {-f|--find|urz�dz.} <plik>    konfiguracja\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9133,32 +9259,32 @@ msgstr ""
 " -v | --verbose           tryb ze szczeg�owymi informacjami\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "%s: podano b��dn� warto�� offsetu '%s'"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "%s: podano b��dny limit rozmiaru '%s'"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Urz�dzenie loop: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "ukradziony loop=%s... ponowna pr�ba\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: urz�dzenie jest zaj�te"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9740,14 +9866,17 @@ msgstr "b��d w wywo�aniu xstrndup"
 msgid "not enough memory"
 msgstr "brak pami�ci"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "Parametr <spec>:\n"
@@ -9757,131 +9886,118 @@ msgstr ""
 " <plik>                               nazwa pliku do u�ycia\n"
 "\n"
 
-#: mount/swapon.c:102
-#, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
 msgstr ""
 "\n"
-"Sk�adnia:\n"
-" %1$s -a [-e] [-v] [-f]             w��czenie wszystkich swap�w z /etc/"
-"fstab\n"
-" %1$s [-p priorytet] [-d] [-v] [-f] <spec>  w��czenie podanego swapa\n"
-" %1$s -s                            informacja o wykorzystaniu swapa\n"
-" %1$s -h                            wy�wietlenie tego opisu\n"
-" %1$s -V                            wy�wietlenie informacji o wersji\n"
-"\n"
+"Sk�adnia: %s [opcje] [plik ...]\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Sk�adnia:\n"
-" %1$s -a [-v]                      wy��czenie wszystkich swap�w\n"
-" %1$s [-v] <spec>                  wy��czenie podanego swapu\n"
-" %1$s -h                           wy�wietlenie tego opisu\n"
-" %1$s -V                           wy�wietlenie informacji o wersji\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:128
+msgid ""
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
+msgstr ""
+
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: nieoczekiwany format pliku"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: ponowna inicjalizacja swapa."
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "wywo�anie execv nie powiod�o si�"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "wywo�anie waitpid nie powiod�o si�"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek nie powi�d� si�"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: zapis sygnatury nie powi�d� si�"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 "%s: znaleziono sygnatur� swapa: wersja %d, rozmiar strony %d, %s kolejno�� "
 "bajt�w"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "inna"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "taka sama"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: niebezpieczne uprawnienia %04o, powinno by� %04o."
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: niebezpieczny w�a�ciciel pliku %d, sugerowany 0 (root)."
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: pomini�to - wydaje si� mie� dziury."
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: odczyt rozmiaru nie powi�d� si�"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: odczyt nag��wka swapa nie powi�d� si�"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr "%s: last_page 0x%08llx wynosi wi�cej ni� rozmiar przestrzeni wymiany"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: rozmiar strony formatu swapa nie zgadza si�."
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9889,37 +10005,37 @@ msgstr ""
 "%s: rozmiar strony formatu swapa nie zgadza si� (--fixpgsz pozwali to "
 "przeinicjowa�)."
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 "%s: wykryto dane programowego wstrzymania. Ponowny zapis sygnatury swapa."
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s: swapon nie powiod�o si�"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "nie mo�na odnale�� urz�dzenia dla %s"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "Trzeba by� superu�ytkownikiem."
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s: swapoff nie powiod�o si�"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10185,7 +10301,7 @@ msgstr "%s: b��d usuwania partycji %d"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "%s: b��d usuwania partycji %d-%d"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, fuzzy, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr "okre�lony przedzia� <%d:%d> nie ma sensu"
@@ -10245,22 +10361,17 @@ msgstr "%s: wykryto tablic� partycji '%s'\n"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "%s: tablica partycji %s nie zawiera u�ytecznych informacji"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 "\n"
 "Sk�adnia:\n"
 " %s [-a|-d|-s] [--nr <N:M> | <urz�dzenie>] <ca�y-dysk>\n"
 
 #: partx/partx.c:587
-#, fuzzy, c-format
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10271,11 +10382,10 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 "\n"
 "Opcje:\n"
@@ -10294,8 +10404,8 @@ msgstr ""
 " -h, --help           wy�wietlenie tego opisu\n"
 "\n"
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
@@ -10303,7 +10413,7 @@ msgstr ""
 "\n"
 "Dost�pne kolumny (dla --show):\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, c-format
 msgid ""
 "\n"
@@ -10312,26 +10422,26 @@ msgstr ""
 "\n"
 "Wi�cej informacji mo�na znale�� w partx(8).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "opcje wykluczaj� si� wzajemnie"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 msgid "failed to parse --nr <M-N> range"
 msgstr "nie uda�o si� przeanalizowa� przedzia�u --nr <M-N>"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "--nr i <partycja> wykluczaj� si� wzajemnie"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "%s: nie uda�o si� zainicjowa� pr�bnika blkid"
@@ -10486,7 +10596,7 @@ msgstr "nie uda�o si� ustawi� polityki dla pidu %d"
 msgid "failed to set pid %d's policy"
 msgstr "nie uda�o si� ustawi� polityki dla pidu %d"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "nie uda�o si� uruchomi� %s"
@@ -10769,7 +10879,7 @@ msgstr "%s: domy�lna warto�� progowa %ld, domy�lny limit czasu %ld\n"
 msgid "Can't set signal handler"
 msgstr "Nie mo�na ustawi� procedury obs�ugi sygna�u"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday nie powiod�o si�"
 
@@ -10778,7 +10888,7 @@ msgstr "gettimeofday nie powiod�o si�"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Nie mo�na wykona� CYGETMON na %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10786,12 +10896,12 @@ msgstr ""
 "%s: %lu przerw., %lu/%lu znak�w; fifo: pr�g %lu, limit %lu, maks. %lu, teraz "
 "%lu\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f przerwa�/sekund�; odbi�r %f, wysy�anie %f (znak�w/sekund�)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10799,7 +10909,7 @@ msgstr ""
 "%s: %lu przerw., %lu znak�w; fifo: pr�g %lu, limit %lu, maks. %lu, teraz "
 "%lu\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f przerwa�/sekund�; odbi�r %f (znak�w/sekund�)\n"
@@ -10891,130 +11001,109 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "nie mo�na sta� si� demonem"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Sk�adnia: %s [opcje]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "nie uda�o si� przeanalizowa� klasy"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "nieznany u�ytkownik %s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "nie uda�o si� przeanalizowa� listy '%s'"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "nieznany kierunek '%s'"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync nie powi�d� si�"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "zapis nie powi�d� si�: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "nie uda�o si� przeanalizowa� offsetu: %s"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "brak polecenia?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctl nie powiod�o si�"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
 msgstr ""
-"Sk�adnia: %s [opcje] <nazwa_pliku>\n"
 "\n"
-"Opcje:\n"
+"Sk�adnia: %s [opcje] [plik ...]\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -11026,7 +11115,7 @@ msgstr ""
 " -o, --offset <ile>  offset przydzia�u w bajtach\n"
 " -l, --length <ile>  d�ugo�� przydzia�u w bajtach\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -11035,31 +11124,31 @@ msgstr ""
 "\n"
 "Wi�cej informacji mo�na znale�� w fallocate(1).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "nie podano argumentu d�ugo�ci"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "podano b��dn� warto�� d�ugo�ci"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "podano b��dn� warto�� offsetu"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "nie podano nazwy pliku."
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr "nieoczekiwana liczba argument�w"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "tryb utrzymywania rozmiaru (opcja -n) nie jest obs�ugiwany"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate nie powiod�o si�"
@@ -11067,18 +11156,24 @@ msgstr "%s: fallocate nie powiod�o si�"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "Sk�adnia: %1$s [-sxun][-w #] fd#\n"
 "          %1$s [-sxon][-w #] plik [-c] polecenie...\n"
@@ -11094,55 +11189,51 @@ msgstr ""
 "  -h  --help       Wy�wietlenie tego opisu\n"
 "  -V  --version    Wy�wietlenie informacji o wersji\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s: %s wymaga dok�adnie jednego argumentu b�d�cego poleceniem\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: nie mo�na otworzy� pliku blokady %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: b��dna liczba: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s: wymaga deskryptora pliku, pliku lub katalogu\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: wywo�anie fork nie powiod�o si�: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Sk�adnia: %s [opcje] <punkt_montowania>\n"
 "\n"
 "Opcje:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
+#, fuzzy
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 " -h, --help          ten opis\n"
 " -f, --freeze        zamro�enie systemu plik�w\n"
 " -u, --unfreeze      odmro�enie systemu plik�w\n"
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11150,36 +11241,35 @@ msgstr ""
 "\n"
 "Wi�cej informacji w fsfreeze(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr "nie okre�lono akcji"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr "nie podano nazwy pliku"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat nie powiod�o si�"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr "%s: nie jest katalogiem"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr "%s: zamro�enie nie powiod�o si�"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s: odmro�enie nie powiod�o si�"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11193,8 +11283,7 @@ msgstr ""
 " -m, --minimum <ile> minimalna d�ugo�� ekstentu do usuni�cia\n"
 " -v, --verbose       wypisanie liczby usuni�tych bajt�w\n"
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11202,98 +11291,87 @@ msgstr ""
 "\n"
 "Wi�cej informacji w fstrim(1).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, c-format
 msgid "failed to parse length: %s"
 msgstr "nie uda�o si� przeanalizowa� d�ugo�ci: %s"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, c-format
 msgid "failed to parse offset: %s"
 msgstr "nie uda�o si� przeanalizowa� offsetu: %s"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "nie uda�o si� przeanalizowa� minimalnej d�ugo�ci ekstentu: %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 msgid "no mountpoint specified."
 msgstr "nie podano punktu montowania."
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, c-format
 msgid "%s: not a directory"
 msgstr "%s: nie jest katalogiem"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: ioctl FITRIM nie powi�d� si�"
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
+#, fuzzy, c-format
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr "%s: obci�to bajt�w: %<PRIu64>\n"
 
-#: sys-utils/ipcmk.c:84
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr ""
-"\n"
-"Sk�adnia: %s [opcje]\n"
-"\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <rozmiar>  utworzenie segmentu pami�ci dzielonej o danym rozmiarze\n"
 "  -S <lsem>     utworzenie tablicy semafor�w o <lsem> elementach\n"
 "  -Q            utworzenie kolejki komunikat�w\n"
 "  -p <tryb>     uprawnienia dla zasobu (domy�lnie 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Wi�cej informacji mo�na znale�� w ipcmk(1).\n"
 "\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "tworzenie pami�ci dzielonej nie powiod�o si�"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "Identyfikator pami�ci dzielonej: %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "tworzenie kolejki komunikat�w nie powiod�o si�"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "Identyfikator kolejki komunikat�w: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "tworzenie semafor�w nie powiod�o si�"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "Identyfikator tablicy semafor�w: %d\n"
@@ -11812,8 +11890,8 @@ msgstr ""
 "Identyfikator segmentu pami�ci dzielonej (shmid)=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11822,8 +11900,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "tryb=%#o\tprawa_dost�pu=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bajt�w=%ld\tlpid=%d\tcpid=%d\tpod��cze�=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11855,8 +11933,8 @@ msgstr ""
 "Identyfikator kolejki komunikat�w (msqid)=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\ttryb=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11888,8 +11966,8 @@ msgstr ""
 "Identyfikator tablicy semafor�w (semid)=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11937,17 +12015,15 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "b��dna flaga: %s"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [-dhV78neo12 ] [-s <szybko��> ] [ -i [-]<flaga> ] <dyscl> "
 "<urz�dzenie>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11955,7 +12031,7 @@ msgstr ""
 "\n"
 "Znane nazwy <dyscl>:\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
@@ -11963,50 +12039,50 @@ msgstr ""
 "\n"
 "Znane nazwy <flag>:\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "b��dna szybko��: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach z pakietu %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "b��dna opcja"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "b��dna dyscyplina linii: %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s nie jest interfejsem szeregowym"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "nie mo�na pobra� atrybut�w terminala dla %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "szybko�� %d nie jest obs�ugiwana"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "nie mo�na ustawi� atrybut�w terminala dla %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "nie mo�na ustawi� dyscypliny linii"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "nie mo�na sta� si� demonem"
 
@@ -12161,15 +12237,14 @@ msgstr "Cache %s:"
 msgid "NUMA node%d CPU(s):"
 msgstr "Procesory w�z�a NUMA %d:"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "Narz�dzie informuj�ce o architekturze CPU\n"
 "\n"
@@ -12178,26 +12253,22 @@ msgstr ""
 "  -s, --sysroot  u�ycie katalogu jako nowego drzewa systemowego\n"
 "  -x, --hex      wypisywanie szesnastkowych masek zamiast list CPU\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12206,12 +12277,12 @@ msgstr ""
 "\n"
 "Wi�cej informacji w mount(8).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s: nie jest katalogiem"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s jest zamontowane.\t "
@@ -12247,46 +12318,44 @@ msgstr ""
 "\t -n              wy��czenie wykrywania kolejno�ci bajt�w\n"
 "\t -V              wypisanie informacji o wersji i zako�czenie\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: b��d zapisu %s: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Przyj�to odwr�con� kolejno�c bajt�w. Opcja -n wymusi natywn� kolejno��.\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Krok pr�bkowania: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): b��dna linia mapy\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: nie znaleziono \"_stext\" w %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: adres profilu spoza zakresu. B��dny plik mapy?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "razem"
 
-#: sys-utils/renice.c:55
-#, c-format
+#: sys-utils/renice.c:56
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12298,10 +12367,8 @@ msgstr ""
 " %1$s [-n] <priorytet>  -u|--user <u�ytkownik> [<u�ytkownik> ...]\n"
 
 #: sys-utils/renice.c:62
-#, c-format
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12318,8 +12385,7 @@ msgstr ""
 " -u, --user <nazwa|id>   interpretowanie jako nazwy lub ID u�ytkownika\n"
 " -v, --version           wy�wietlenie wersji\n"
 
-#: sys-utils/renice.c:70
-#, c-format
+#: sys-utils/renice.c:69
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12327,71 +12393,60 @@ msgstr ""
 "\n"
 "Wi�cej informacji w renice(1).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice z pakietu %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, c-format
 msgid "unknown user %s"
 msgstr "nieznany u�ytkownik %s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, c-format
 msgid "bad value %s"
 msgstr "b��dna warto�� %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr "ID procesu"
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 msgid "user ID"
 msgstr "ID u�ytkownika"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr "ID grupy proces�w"
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "nie uda�o si� odczyta� priorytetu dla %d (%s)"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "nie uda�o si� ustawi� priorytetu dla %d (%s)"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d (%s): stary priorytet %d, nowy priorytet %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Sk�adnia: %s [opcje]\n"
-"\n"
-"Opcje:\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "    -d | --device <urz�dzenie>  wyb�r urz�dzenia RTC (rtc0|rtc1|...)\n"
 "    -n | --dry-run              wykonanie wszystkiego poza u�pieniem\n"
@@ -12403,8 +12458,7 @@ msgstr ""
 "    -v | --verbose              szczeg�owe komunikaty\n"
 "    -V | --version              wy�wietlenie wersji\n"
 
-#: sys-utils/rtcwake.c:100
-#, c-format
+#: sys-utils/rtcwake.c:101
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12412,150 +12466,150 @@ msgstr ""
 "\n"
 "Wi�cej informacji w rtcwake(8).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 msgid "read rtc time failed"
 msgstr "odczyt czasu RTC nie powi�d� si�"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 msgid "read system time failed"
 msgstr "odczyt czasu systemowego nie powi�d� si�"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 msgid "convert rtc time failed"
 msgstr "przeliczanie czasu RTC nie powiod�o si�"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 msgid "set rtc alarm failed"
 msgstr "ustawianie alarmu RTC nie powiod�o si�"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr "w��czanie alarmu RTC nie powiod�o si�"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr "ustawianie budzika RTC nie powiod�o si�"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 msgid "read rtc alarm failed"
 msgstr "odczyt alarmu RTC nie powi�d� si�"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr "alarm: wy��czony\n"
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 msgid "convert time failed"
 msgstr "przeliczanie czasu nie powiod�o si�"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr "alarm: w��czony  %s"
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "nieznany stan u�pienia '%s'"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 msgid "failed to parse seconds value"
 msgstr "nie uda�o si� przeanalizowa� warto�ci sekund"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 msgid "failed to parse time_t value"
 msgstr "nie uda�o si� przeanalizowa� warto�ci time_t"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: za�o�ono, �e RTC u�ywa UTC...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "U�ycie czasu UTC.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "U�ycie czasu lokalnego.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr "trzeba poda� czas pobudki (opcja -t lub -s)"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s nie ma w��czonych zdarze� budzenia"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarm %ld, sys_time %ld, rtc_time %ld, sekund: %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr "czas nie biegnie wstecz do %s"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: pobudka przy u�yciu %s w chwili %s"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: pobudka z trybu \"%s\" przy u�yciu %s w chwili %s"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr "tryb u�pienia: brak; opuszczanie\n"
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr "tryb u�pienia: wy��czenie; wywo�ywanie %s\n"
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, c-format
 msgid "unable to execute %s"
 msgstr "nie uda�o si� uruchomi� %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr "tryb u�pienia: w��czony; odczytywanie RTC\n"
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 msgid "rtc read failed"
 msgstr "odczyt RTC nie powi�d� si�"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr "tryb u�pienia: wy��czony; wy��czanie budzika\n"
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr "tryb u�pienia: wy�wietlenie; wypisywanie informacji o budziku\n"
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr "tryb u�pienia: %s; usypianie systemu\n"
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr "wy��czanie przerwania pobudki RTC nie powiod�o si�"
 
@@ -12629,16 +12683,16 @@ msgstr ""
 "%s: %s\n"
 "`%s --help' wy�wietli wi�cej informacji.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: Nieznana architektura"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Za ma�o argument�w"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Nie uda�o si� ustawi� osobowo�ci na %s"
@@ -12722,20 +12776,19 @@ msgstr "%s u�ywa IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s u�ywa odpytywania\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "Sk�adnia: %s [opcje] <program> [argumenty...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "Uruchomienie programu z cz�ci� przestrzeni nazw odosobnionych od rodzica\n"
 "\n"
@@ -12745,8 +12798,7 @@ msgstr ""
 "  -i, --ipc         oddzielenie przestrzeni SysV IPC\n"
 "  -n, --net         oddzielenie przestrzeni sieciowej\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12754,147 +12806,147 @@ msgstr ""
 "\n"
 "Wi�cej informacji mo�na znale�� w unshare(1).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshare nie powiod�o si�"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "nie mo�na ustawi� identyfikatora grupy"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "nie mo�na ustawi� identyfikatora u�ytkownika"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: nie mo�na wywo�a� %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s: nie mo�na wywo�a� %s: %m"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: nie znaleziono procese \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: nie mo�na wywo�a� %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "nie uda�o si� przydzieli� bufora wyj�ciowego"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "b��dna warto�� limitu czasu: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Za ma�o argument�w"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "nie uda�o si� przydzieli� bufora wyj�ciowego"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "b��dna szybko��: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "zbyt du�o zamiennych szybko�ci"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: nie mo�na otworzy� jako standardowe wej�cie: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: to nie jest urz�dzenie znakowe"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: nie jest otwarte do odczytu i zapisu"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problem z dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "typ: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: read: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: przepe�nienie wej�cia"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12906,69 +12958,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "u�ytkownik"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "u�ytkownik�w"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 msgid "ttyname failed"
 msgstr "ttyname nie powiod�o si�"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, c-format
 msgid "stat %s failed"
 msgstr "stat %s nie powiod�o si�"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 msgid "is y"
 msgstr "jest w��czone (y)"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 msgid "is n"
 msgstr "jest wy��czone (n)"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, c-format
 msgid "change %s mode failed"
 msgstr "zmiana uprawnie� %s nie powiod�a si�"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "b��dna flaga: %s"
@@ -12984,54 +13030,48 @@ msgstr ""
 "Prosz� u�y� `%s [opcje] %s', je�eli naprawd� ma by u�yty.\n"
 "Skrypt nie uruchomiony.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje] [plik ...]\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "nie mo�na pliku czas�w %s"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skrypt uruchomiony, plik to %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Skrypt uruchomiony %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: nie mo�na zapisa� pliku skryptu, b��d: %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -13040,79 +13080,76 @@ msgstr ""
 "\n"
 "Skrypt wykonany %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skrypt wykonany, plik to %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty nie powiod�o si�\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Brak wolnych pty\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <plik_czas�w> [<skrypt> [<dzielnik>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "oczekiwano liczby, otrzymano '%s'"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "dzielnik '%s'"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "zapis na standardowe wyj�cie nie powi�d� si�"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "nieoczekiwany koniec pliku %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "nie uda�o si� odczyta� pliku skryptu %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "nieoczekiwana liczba argument�w"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "nie mo�na otworzy� pliku skryptu %s"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "nie uda�o si� odczyta� pliku czas�w %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "plik czas�w %s: %lu: nieoczekiwany format"
@@ -13123,50 +13160,47 @@ msgid "Argument error."
 msgstr "%s: B��d argumentu, sk�adnia\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13175,61 +13209,61 @@ msgstr ""
 "\n"
 "Wi�cej informacji w lsblk(8).\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "nie mo�na wymusi� wygaszenia\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "nie mo�na wymusi� braku wygaszenia\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "nie mo�na odczyta� stanu wygaszenia\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "nie mo�na w��czy�/wy��czy� trybu oszcz�dzania energii\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "nie mo�na otworzy� urz�dzenia %s do zapisu\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "b��d klogctl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "B��d zapisu zrzutu ekranu\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Nie mo�na odczyta� %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: nie zdefiniowano $TERM.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: nieznany sygna� %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13257,144 +13291,149 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje] [plik ...]\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "b��dna opcja"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "b��dna warto�� limitu czasu: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "nie mo�na otworzy� pliku tymczasowego"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "nie mo�na ustawi� identyfikatora u�ytkownika"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Nie mo�na pobra� rozmiaru dysku"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Zbiorowy komunikat od u�ytkownika %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr "odmowa czytania %s - u�yte b�dzie standardowe wej�cie."
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 msgid "fstat failed"
 msgstr "fstat nie powiod�o si�"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 msgid "fread failed"
 msgstr "fread powiod�o si�"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Sk�adnia: %s [opcje] �cie�ka [�cie�ka ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: nie znaleziono nazwy tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: prawo zapisu jest wy��czone.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: u�ytkownik %s nie jest zalogowany na %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s ma wy��czone komunikaty na %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: u�ytkownik %s nie jest zalogowany\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s ma wy��czone komunikaty\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: u�ytkownik %s jest zalogowany wi�cej ni� raz; napisano na %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Linia wej�ciowa zbyt d�uga."
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Komunikat od %s@%s (jako %s) na %s o %s..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Komunikat od %s@%s na %s o %s..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc nie powiod�o si�"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Sk�adnia: %s [opcje]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13591,7 +13630,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13797,7 +13836,7 @@ msgstr ""
 "\n"
 "Nie znaleziono wzorca\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Nie znaleziono wzorca"
 
@@ -13863,7 +13902,7 @@ msgstr "hexdump: b��dny format {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: b��dny znak konwersji %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13916,7 +13955,7 @@ msgstr ""
 "Wi�cej informacji mo�na znale�� w pg(1).\n"
 "-------------------------------------------------------\n"
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13924,81 +13963,81 @@ msgstr ""
 "%s: Sk�adnia: %s [-liczba] [-p �a�cuch] [-cefnrs] [+linia] [+/wzorzec/] "
 "[pliki]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: opcja musi mie� argument -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: b��dna opcja -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...przewijanie w prz�d\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...przewijanie w ty�\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Brak nast�pnego pliku"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Brak poprzedniego pliku"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: B��d odczytu z pliku %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Nieoczekiwany EOF w pliku %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Nieznany b��d w pliku %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Nie mo�na utworzy� pliku tymczasowego\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "B��d wyra�enia regularnego: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Brak zapami�tanego szukanego �a�cucha"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Nie mo�na otworzy� "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "zapisano"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !polecenie nie jest dozwolone w trybie z opcj� -r.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() nie powi�d� si�, prosz� spr�bowa� p�niej\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Nast�pny plik: "
 
@@ -14073,8 +14112,8 @@ msgstr ""
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -14090,38 +14129,316 @@ msgstr "nie uda�o si� przeanalizowa� offsetu: %s"
 msgid "no input file specified"
 msgstr "nie podano nazwy pliku"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr ""
+"\n"
+"Sk�adnia: %s [opcje] [plik ...]\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "problem z odczytem terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "nieznana sekwencja specjalna na wej�ciu: %o, %o"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 msgid "Input line too long."
 msgstr "Linia wej�ciowa zbyt d�uga."
 
-#~ msgid "Usage:\n"
-#~ msgstr "Sk�adnia:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "B��d podczas zamykania pliku\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Mo�na zmieni� znacznik tylko dla niepustych partycji.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Uwaga: partycja %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Uwaga: partycje %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "i %s zachodz� na siebie\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sk�adnia:\n"
+#~ " %s [opcje] [<urz�dzenie> ...]\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "urz�dzenie: co� w stylu /dev/hda lub /dev/sda"
+
+#~ msgid "success"
+#~ msgstr "sukces"
+
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -a, --all               mount all filesystems mentioned in fstab\n"
+#~ " -f, --fake              dry run, skip mount(2) syscall\n"
+#~ " -F, --fork              fork off for each device (use with -a)\n"
+#~ " -h, --help              this help\n"
+#~ " -n, --no-mtab           don't write to /etc/mtab\n"
+#~ " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
+#~ " -v, --verbose           verbose mode\n"
+#~ " -V, --version           print version string\n"
+#~ " -w, --read-write        mount the filesystem read-write (default)\n"
+#~ " -o, --options <list>    comma separated string of mount options\n"
+#~ " -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
+#~ " -t, --types <list>      indicate the filesystem type\n"
+#~ " -c, --no-canonicalize   don't canonicalize paths\n"
+#~ " -i, --internal-only     don't call the mount.<type> helpers\n"
+#~ " -l, --show-labels       lists all mounts with LABELs\n"
+#~ "\n"
+#~ "Source:\n"
+#~ " -L, --label <label>     synonym for LABEL=<label>\n"
+#~ " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
+#~ " LABEL=<label>           specifies device by filesystem label\n"
+#~ " UUID=<uuid>             specifies device by filesystem UUID\n"
+#~ " <device>                specifies device by path\n"
+#~ " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
+#~ " <file>                  regular file for loopdev setup\n"
+#~ "\n"
+#~ "Operations:\n"
+#~ " -B, --bind              mount a subtree somewhere else (same as -o "
+#~ "bind)\n"
+#~ " -M, --move              move a subtree to some other place\n"
+#~ " -R, --rbind             mount a subtree and all submounts somewhere "
+#~ "else\n"
+#~ " --make-shared           mark a subtree as shared\n"
+#~ " --make-slave            mark a subtree as slave\n"
+#~ " --make-private          mark a subtree as private\n"
+#~ " --make-unbindable       mark a subtree as unbindable\n"
+#~ " --make-rshared          recursively mark a whole subtree as shared\n"
+#~ " --make-rslave           recursively mark a whole subtree as slave\n"
+#~ " --make-rprivate         recursively mark a whole subtree as private\n"
+#~ " --make-runbindable      recursively mark a whole subtree as unbindable\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Opcje:\n"
+#~ " -a, --all               zamontowanie wszystkich system�w plik�w z "
+#~ "fstaba\n"
+#~ " -f, --fake              pusty przebieg, pomini�cie wywo�a� mount(2)\n"
+#~ " -F, --fork              osobny proces dla ka�dego urz�dzenia (z opcj� -"
+#~ "a)\n"
+#~ " -h, --help              ten opis\n"
+#~ " -n, --no-mtab           bez zapisu do /etc/mtab\n"
+#~ " -r, --read-only         montowanie tylko do odczytu (to samo, co -o ro)\n"
+#~ " -v, --verbose           tryb ze szczeg�owymi komunikatami\n"
+#~ " -V, --version           wypisanie informacji o wersji\n"
+#~ " -w, --read-write        montowanie do odczytu i zapisu (domy�lne)\n"
+#~ " -o, --options <lista>   rozdzielone przecinkami opcje montowania\n"
+#~ " -O, --test-opts <lista> ograniczenie zbioru system�w plik�w (z opcj� -"
+#~ "a)\n"
+#~ " -t, --types <lista>     okre�lenie typu systemu plik�w\n"
+#~ " -c, --no-canonicalize   bez normalizowania �cie�ek\n"
+#~ " -i, --internal-only     bez wywo�ywania program�w pomocniczych mount."
+#~ "<typ>\n"
+#~ " -l, --show-labels       lista wszystkich montowa� z etykietami\n"
+#~ "\n"
+#~ "�r�d�o:\n"
+#~ " -L, --label <etykieta>  synonim LABEL=<etykieta>\n"
+#~ " -U, --uuid <uuid>       synonim UUID=<uuid>\n"
+#~ " LABEL=<etykieta>        okre�lenie urz�dzenia po etykiecie systemu "
+#~ "plik�w\n"
+#~ " UUID=<uuid>             okre�lenie urz�dzenia po UUID-ie systemu plik�w\n"
+#~ " <urz�dzenie>            okre�lenie urz�dzenia po �cie�ce\n"
+#~ " <katalog>               punkt montowania dla montowa� bind (p. --bind/"
+#~ "rbind)\n"
+#~ " <plik>                  zwyk�y plik do utworzenia urz�dzenia loop\n"
+#~ "\n"
+#~ "Operacje:\n"
+#~ " -B, --bind              zamontowanie poddrzewa gdzie� indziej (syn. -o "
+#~ "bind)\n"
+#~ " -M, --move              przeniesienie poddrzewa w inne miejsce\n"
+#~ " -R, --rbind             zamontowaie poddrzewa wraz z montowaniami "
+#~ "wewn�trz\n"
+#~ " --make-shared           uczynienie poddrzewa wsp�dzielonym\n"
+#~ " --make-slave            uczynienie poddrzewa podporz�dkowanym\n"
+#~ " --make-private          uczynienie poddrzewa prywatnym\n"
+#~ " --make-unbindable       uczynienie poddrzewa niedost�pnym dla opcji "
+#~ "bind\n"
+#~ " --make-rshared          rekurencyjne uczynienie poddrzewa "
+#~ "wsp�dzielonym\n"
+#~ " --make-rslave           rekurencyjne uczynienie poddrzewa "
+#~ "podporz�dkowanym\n"
+#~ " --make-rprivate         rekurencyjne uczynienie poddrzewa prywatnym\n"
+#~ " --make-runbindable      rekurencyjne uczynienie poddrzewa niedost�pnym "
+#~ "dla bind\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -s, --fstab            search in static table of filesystems\n"
+#~ " -m, --mtab             search in table of mounted filesystems\n"
+#~ " -k, --kernel           search in kernel table of mounted \n"
+#~ "                        filesystems (default)\n"
+#~ "\n"
+#~ " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
+#~ " -w, --timeout <num>    upper limit in millisecods which --poll will "
+#~ "block\n"
+#~ "\n"
+#~ " -c, --canonicalize     canonicalize printed paths\n"
+#~ " -d, --direction <word> search direction - 'forward' or 'backward'\n"
+#~ " -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+#~ " -f, --first-only       print the first found filesystem only\n"
+#~ " -h, --help             print this help\n"
+#~ " -i, --invert           invert sense of matching\n"
+#~ " -l, --list             use list format output\n"
+#~ " -n, --noheadings       don't print headings\n"
+#~ " -u, --notruncate       don't truncate text in columns\n"
+#~ " -O, --options <list>   limit the set of filesystems by mount options\n"
+#~ " -o, --output <list>    output columns\n"
+#~ " -P, --pairs            use key=\"value\" output format\n"
+#~ " -r, --raw              use raw output format\n"
+#~ " -a, --ascii            use ascii chars for tree formatting\n"
+#~ " -t, --types <list>     limit the set of filesystem by FS types\n"
+#~ " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
+#~ " -R, --submounts        print all submount for the matching filesystems\n"
+#~ " -S, --source <string>  device, LABEL= or UUID=device\n"
+#~ " -T, --target <string>  mountpoint\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Opcje:\n"
+#~ " -s, --fstab            szukanie w statycznej tablicy system�w plik�w\n"
+#~ " -m, --mtab             szukanie w tablicy zamontowanych system�w plik�w\n"
+#~ " -k, --kernel           szukanie w tablicy zamontowanych system�w plik�w\n"
+#~ "                        w j�drze (domy�lne)\n"
+#~ "\n"
+#~ " -c, --canonicalize     wypisywanie �cie�ek w postaci kanonicznej\n"
+#~ " -d, --direction <typ>  kierunek wyszukiwania - 'forward' lub 'backward'\n"
+#~ " -e, --evaluate         wypisanie wszystkich znanych znacznik�w (LABEL/"
+#~ "UUID)\n"
+#~ " -f, --first-only       wypisanie tylko pierwszego znalezionego systemu "
+#~ "plik�w\n"
+#~ " -h, --help             wy�wietlenie tego opisu\n"
+#~ " -i, --invert           odwr�cenie dopasowania\n"
+#~ " -l, --list             wyj�cie w postaci listy\n"
+#~ " -n, --noheadings       bez wypisywania nag��wk�w\n"
+#~ " -u, --notruncate       bez skracania tekstu w kolumnach\n"
+#~ " -O, --options <lista>  ograniczenie zbioru system�w plik�w wg opcji "
+#~ "mounta\n"
+#~ " -o, --output <lista>   wypisywanie kolumn\n"
+#~ " -r, --raw              wyj�cie w postaci surowej\n"
+#~ " -a, --ascii            u�ycie znak�w ASCII do formatowania drzewa\n"
+#~ " -t, --types <lista>    ograniczenie zbioru system�w plik�w wg typu FS\n"
+#~ " -v, --nofsroot         bez wypisywania [/dir] dla montowa� bind i btrfs\n"
+#~ " -R, --submounts        wypisanie wszystkich montowa� poni�ej (submount)\n"
+#~ "                        dla pasuj�cych system�w plik�w\n"
+#~ " -S, --source <�a�cuch> urz�dzenie, LABEL= lub UUID=urz�dzenie\n"
+#~ " -T, --target <�a�cuch> punkt montowania\n"
+#~ "\n"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd bajt�w ["
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sk�adnia:\n"
+#~ " %1$s -a [-e] [-v] [-f]             w��czenie wszystkich swap�w z /etc/"
+#~ "fstab\n"
+#~ " %1$s [-p priorytet] [-d] [-v] [-f] <spec>  w��czenie podanego swapa\n"
+#~ " %1$s -s                            informacja o wykorzystaniu swapa\n"
+#~ " %1$s -h                            wy�wietlenie tego opisu\n"
+#~ " %1$s -V                            wy�wietlenie informacji o wersji\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sk�adnia:\n"
+#~ " %1$s -a [-v]                      wy��czenie wszystkich swap�w\n"
+#~ " %1$s [-v] <spec>                  wy��czenie podanego swapu\n"
+#~ " %1$s -h                           wy�wietlenie tego opisu\n"
+#~ " %1$s -V                           wy�wietlenie informacji o wersji\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Sk�adnia: %s [opcje] <nazwa_pliku>\n"
+#~ "\n"
+#~ "Opcje:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sk�adnia: %s [opcje]\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Sk�adnia: %s [opcje]\n"
+#~ "\n"
+#~ "Opcje:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sk�adnia: %s [opcje] [plik ...]\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14260,28 +14577,11 @@ msgstr "Linia wej�ciowa zbyt d�uga."
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [lub --help]:      wypisanie tej informacji"
 
-#~ msgid "dangerous options:"
-#~ msgstr "niebezpieczne opcje:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [lub --show-geometry]: wypisanie informacji j�dra o geometrii"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [lub --show-pt-geometry]: wypisanie geometrii odgadni�tej z tabl. "
-#~ "part."
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [lub --show-extended]: wypisywanie tak�e partycji rozszerzonych\n"
-#~ "                              lub oczekiwanie ich deskryptor�w na wej�ciu"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14337,56 +14637,9 @@ msgstr "Linia wej�ciowa zbyt d�uga."
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [opcje] [--] optstring parametry\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [opcje] -o|--options optstring [opcje] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              parametry\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Zezwolenie na d�ugie opcje z jednym - na "
-#~ "pocz�tku\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Ten kr�tki opis u�ycia\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr ""
-#~ "  -l, --longoptions=opcje      D�ugie opcje, jakie maj� by� rozpoznawane\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=program           Nazwa z jak� maj� by� zg�aszane b��dy\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr ""
-#~ "  -o, --options=optstring      Kr�tkie opcje, jakie maj� by� "
-#~ "rozpoznawane\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Wy��czenie komunikat�w b��d�w z getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Bez standardowego wyj�cia\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=pow�oka          Ustawienie konwencji cytowania pow�oki\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Sprawdzenie wersji getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unquote                Bez cytowania wyj�cia\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Wypisanie informacji o wersji\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (rozszerzony) 1.1.4\n"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 758e52064..5b6dea619 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13,8 +13,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.11b\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2001-05-24 16:03-03:00\n"
 "Last-Translator: Rodrigo Stulzer Lopes <rodrigo@conectiva.com.br>\n"
 "Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
@@ -118,29 +118,29 @@ msgstr "ler novamente tabela de parti��es"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "obter tamanho"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, fuzzy, c-format
 msgid "%s (%s)\n"
 msgstr "%s em %s\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "n�o foi poss�vel abrir %s"
@@ -219,7 +219,7 @@ msgid "Verifying ... "
 msgstr "Verificando..."
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "N�o foi poss�vel abrir o arquivo '%s'"
@@ -259,15 +259,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -280,7 +280,7 @@ msgstr "%s de %s\n"
 msgid "cannot stat file %s"
 msgstr "n�o foi poss�vel verificar status de dispositivo %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -324,8 +324,8 @@ msgid "stat failed: %s"
 msgstr "(Pr�ximo arquivo: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty falhou\n"
@@ -554,55 +554,55 @@ msgstr "id inv�lido: %s\n"
 msgid "compiled without -x support"
 msgstr "umount: compilado sem suporte a -f\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uso: %s [ -larvsmf] dispositivo\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s est� montado.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Voc� realmente deseja continuar?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "verifica��o anulada.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, fuzzy, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "N�mero de zona menor que FIRSTZONE no arquivo `"
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, fuzzy, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "N�mero de zona maior ou igual a ZONES no arquivo `"
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Remover bloco"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, fuzzy, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Erro de leitura: n�o foi poss�vel buscar bloco no arquivo '"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, fuzzy, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Erro de leitura: bloco defeituoso no arquivo '"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -611,298 +611,298 @@ msgstr ""
 "Erro interno: tentando gravar bloco defeituoso.\n"
 "Solicita��o de grava��o ignorada.\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "busca falhou em write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, fuzzy, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Erro de grava��o: bloco defeituoso no arquivo '"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "busca falhou em write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "n�o foi poss�vel gravar superbloco"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "N�o foi poss�vel gravar mapa de inode"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "N�o foi poss�vel gravar mapa de zona"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "N�o foi poss�vel gravar inodes"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "busca falhou"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "n�o foi poss�vel alocar buffers para mapas"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "n�o foi poss�vel ler superbloco"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "n�mero m�gico inv�lido no superbloco"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Somente 1K blocos/zonas suportados"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "campo s_imap_blocks inv�lido no superbloco"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "campo s_zmap_blocks inv�lido no superbloco"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "N�o foi poss�vel alocar buffer para mapa de inodes"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "N�o foi poss�vel alocar buffer para mapa de inodes"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "N�o foi poss�vel alocar buffer para inodes"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "N�o foi poss�vel alocar buffer para contagem de inodes"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "N�o foi poss�vel alocar buffer para contagem de zonas"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "N�o foi poss�vel ler mapa de inodes"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "N�o foi poss�vel ler mapa de zonas"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "N�o foi poss�vel ler inodes"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Aviso: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blocos\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Primeira zona de dados = %ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Tamanho da zona = %d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Tamanho m�ximo = %ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Estado do sistema de arquivos = %d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "Comprimento do nome = %d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, fuzzy, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d marcado como n�o utilizado, mas usado pelo arquivo '"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Marca em uso"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, fuzzy, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr " tem modo %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Aviso: contagem de inodes grande demais.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "inode raiz n�o � um diret�rio"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, fuzzy, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "O bloco j� foi usado. Agora no arquivo `"
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Limpar"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, fuzzy, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "' est� marcado como n�o utilizado."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Correto"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, fuzzy, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr " cont�m um n�mero de inode inv�lido para o arquivo '"
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Remover"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, fuzzy, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr ": diret�rio inv�lido: '.' n�o � o primeiro\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, fuzzy, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr ": diret�rio inv�lido: '..' n�o � o segundo\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "erro interno"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, fuzzy, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ": diret�rio inv�lido: tamanho < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "busca falhou em bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "O modo do inode %d n�o foi limpo."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 "O inode %d n�o est� sendo usado, mas est� marcado como em uso no bitmap."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr ""
 "O inode %d est� sendo usado, mas est� marcado como n�o utilizado no bitmap."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Configurar"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (modo = %07o), i_nlinks = %d, contados = %d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Configurar i_nlinks para contagem"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zona %d marcada em uso, mas nenhum arquivo a usa."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Desmarcar"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
 #, fuzzy, c-format
-msgid "Zone %d: in use, counted=%d\n"
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zona %d: %s em uso, contados = %d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
 #, fuzzy, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zona %d: %s em uso, contados = %d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "tamanho de inode inv�lido"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "tamanho de inode v2 inv�lido"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "� necess�rio um terminal para reparos interativos"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "n�o foi poss�vel abrir '%s'"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s est� limpo; sem verifica��o.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "For�ando verifica��o do sistema de arquivos em %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "O sistema de arquivos em %s est� sujo: precisa de verifica��o\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -911,12 +911,12 @@ msgstr ""
 "\n"
 "%6ld inodes usados (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zonas usadas (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -939,7 +939,7 @@ msgstr ""
 "------\n"
 "%6d arquivos\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1063,7 +1063,7 @@ msgstr "muitos inodes - m�ximo � 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "pouco espa�o, � necess�rio pelo menos %lu blocos"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Dispositivo: %s\n"
@@ -1214,8 +1214,8 @@ msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr "Erro no fechamento de %s\n"
+msgid "cannot close file %s"
+msgstr "N�o foi poss�vel abrir o arquivo '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1317,88 +1317,98 @@ msgid ""
 "that some device files will be wrong."
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Uso: %s [-c | -l NomeArquivo] [-nXX] [-iXX] dispositivo [blocos]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s est� montado; n�o criar� um sistema de arquivos aqui!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "busca de bloco de boot falhou em write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "n�o foi poss�vel limpar o setor de boot"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "busca falhou em write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "n�o foi poss�vel gravar superbloco"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "n�o foi poss�vel gravar mapa de inodes"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "n�o foi poss�vel gravar mapa de zonas"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "n�o foi poss�vel gravar inodes"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "busca falhou em write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "grava��o falhou em write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "n�mero excessivo de blocos defeituosos"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "n�o h� blocos sem problemas suficientes"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "n�o foi poss�vel alocar buffers para mapas"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "n�o foi poss�vel alocar buffers para mapas"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "n�o foi poss�vel alocar buffers para inodes"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodes\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blocos\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1407,99 +1417,99 @@ msgstr ""
 "Tamanho m�ximo = %ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "busca falhou durante teste de blocos"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Valores estranhos em do_check: provavelmente erros\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "busca falhou em check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "blocos defeituosos antes da �rea de dados: n�o � poss�vel criar sistema de "
 "arquivos"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d blocos defeituosos\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "um bloco defeituoso\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "n�o foi poss�vel abrir arquivo de blocos defeituosos"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "N�o foi poss�vel ler a unidade de disco"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "tamanho de inode inv�lido"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "erro de strtol: n�mero de blocos n�o especificado"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "busca falhou"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty falhou\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: o dispositivo est� ocupado"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "n�o ser� tentado criar sistema de arquivos em '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "N�mero de setores"
@@ -1834,7 +1844,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "busca falhou em write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2179,7 +2189,7 @@ msgid "   Logical"
 msgstr "   L�gica"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Desconhecido"
 
@@ -2857,12 +2867,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Comando para r�tulo de disco BSD (tecle m para obter ajuda): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Primeiro %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "�ltimo %s ou +tamanho ou +tamanho M ou  +tamanho K"
@@ -3008,7 +3018,7 @@ msgid "tracks/cylinder"
 msgstr "trilhas/cilindro"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cilindros"
 
@@ -3075,12 +3085,12 @@ msgstr "O n�mero m�ximo de parti��es foi criado\n"
 msgid "This partition already exists.\n"
 msgstr "Esta parti��o j� existe.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Aviso: n�mero de parti��es excessivo (%d; o m�ximo  � %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3285,7 +3295,7 @@ msgstr "Voc� precisa configurar"
 msgid "heads"
 msgstr "cabe�as"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "setores"
 
@@ -3712,7 +3722,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Boot    In�cio      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Dispositivo"
 
@@ -3797,7 +3807,7 @@ msgstr "O total de setores alocados, %d, � maior do que o m�ximo: %d\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%d setores n�o alocados\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3941,38 +3951,38 @@ msgstr "Erro no fechamento de %s\n"
 msgid "Syncing disks.\n"
 msgstr "Sincronizando discos.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "A parti��o %d n�o possui �rea de dados\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Novo in�cio dos dados"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Comando avan�ado (m para ajuda): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "N�mero de cilindros"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "N�mero de cabe�as"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "N�mero de setores"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "Aviso: configurando o deslocamento de setor para compatibilidade com DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3981,34 +3991,34 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "O disco %s n�o cont�m uma tabela de parti��es v�lida\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "n�o foi poss�vel abrir %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: comando desconhecido:\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Este kernel localiza o tamanho de setor por conta pr�pria - op��o -b "
 "ignorada\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4017,18 +4027,18 @@ msgstr ""
 "Aviso: a op��o -b (configurar tamanho de setor) deve ser usada com um "
 "dispositivo especificado\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, fuzzy, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Detectado um r�tulo OSF/1 em %s, entrando em modo de r�tulo.\n"
 "Para retornar ao modo de tabela de parti��es do DOS, use o comando 'r'.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Comando (m para ajuda): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4037,16 +4047,16 @@ msgstr ""
 "\n"
 "O arquivo de boot atual �: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Informe o nome do novo arquivo de boot: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Arquivo de boot inalterado\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4372,10 +4382,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tVoc� escolheu um nome de arquivo de inicializa��o incomum.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr ""
-"Desculpe. Voc� pode alterar apenas a etiqueta de parti��es n�o vazias.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Somente o superusu�rio pode alterar o rel�gio de hardware.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4392,7 +4401,7 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja etiquetar esta parti��o de modo "
 "diferente.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr ""
 
@@ -4590,7 +4599,7 @@ msgstr "Intervalo n�o utilizado - setores 0 - %d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Intervalo n�o utilizado - setores %d - %d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4599,7 +4608,7 @@ msgstr ""
 "Outras parti��es j� cobrem o disco inteiro.\n"
 "Exclua ou reduza algumas antes de tentar novamente.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4608,12 +4617,12 @@ msgstr ""
 "Recomenda-se fortemente que a parti��o 11\n"
 "cubra todo o disco e seja do tipo `volume SGI'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4624,7 +4633,7 @@ msgstr ""
 "%d %s cobre alguma outra parti��o. Sua entrada foi alterada\n"
 "para %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4633,7 +4642,7 @@ msgstr ""
 "Se voc� deseja manter compatibilidade com SunOS/Solaris, considere deixar\n"
 "esta parti��o como um disco inteiro (5), come�ando em 0, com %u setores\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4648,7 +4657,7 @@ msgstr ""
 "Digite SIM se tiver certeza de que deseja rotular esta parti��o como 82 "
 "(permuta do Linux): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4668,7 +4677,7 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4681,28 +4690,28 @@ msgstr ""
 "Unidades = %s de %d * 512 bytes\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Op��o   In�cio      Fim    Blocos   Id  Sistema\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "N�mero de cilindros alternativos"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Setores extras por cilindro: "
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Fator de \"Interleave\""
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Velocidade de rota��o (RPM)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "N�mero de cilindros f�sicos"
 
@@ -5175,7 +5184,7 @@ msgstr "Disco %s: n�o foi poss�vel obter a geometria\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disco %s: n�o foi poss�vel obter o tamanho\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5186,22 +5195,22 @@ msgstr ""
 "inteiro. Usar fdisk nela provavelmente n�o trar� qualquer resultado\n"
 "(use a op��o --force se realmente quiser realizar esta opera��o).\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Aviso: HDIO_GETGEO informa que h� %lu cabe�as\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Aviso: HDIO_GETGEO informa que h� %lu setores\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Aviso: BLKGETSIZE/HDIO_GETGEO informa que h� %lu cilindros\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5211,7 +5220,7 @@ msgstr ""
 "Isto causar� problemas a todo software que usar endere�amento Cil/Cab/"
 "Setor.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5220,7 +5229,7 @@ msgstr ""
 "\n"
 "Disco %s: %lu cilindros, %lu cabe�as, %lu setores/trilha\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5228,7 +5237,7 @@ msgstr ""
 "%s da parti��o %s possui valor imposs�vel para cabe�a: %lu (deveria estar "
 "entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5237,7 +5246,7 @@ msgstr ""
 "%s da parti��o %s possui valor imposs�vel para setor: %lu (deveria estar "
 "entre 1 e %lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5246,7 +5255,7 @@ msgstr ""
 "%s da parti��o %s possui valor imposs�vel para o cilindro: %lu (deveria "
 "estar entre 0 e %lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5255,12 +5264,12 @@ msgstr ""
 "Nome Id\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Relendo a tabela de parti��es...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5270,26 +5279,26 @@ msgstr ""
 "O comando para reler a tabela de parti��es falhou.\n"
 "Reinicialize o sistema agora, antes de usar o mkfs.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Erro no fechamento de %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: parti��o inexistente\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "formato n�o reconhecido - usando setores\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "formato n�o implementado - usando %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5299,12 +5308,12 @@ msgstr ""
 "de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, fuzzy, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Disp   Boot In�cio    Fim   Cils    Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5313,12 +5322,12 @@ msgstr ""
 "Unidades = setores de 512 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, fuzzy, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Disp   Boot    In�cio      Fim  Setores   Id  Sistema\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5327,12 +5336,12 @@ msgstr ""
 "Unidades = blocos de 1024 bytes, contando a partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, fuzzy, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Disp   Boot   In�cio      Fim   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, fuzzy, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5342,33 +5351,33 @@ msgstr ""
 "partir de %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, fuzzy, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Disp   Boot In�cio  Fim     MB   Blocos    Id  Sistema\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tin�cio: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tfim: (cil,cab,set) esperado (%ld,%ld,%ld) encontrado (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a parti��o termina no cilindro %ld, al�m do final do disco\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Nenhuma parti��o encontrada\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, fuzzy, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5379,86 +5388,76 @@ msgstr ""
 " para Cil/Cab/Set = */%ld/%ld (em vez de %ld/%ld/%ld).\n"
 "Para esta listagem ser� assumida aquela geometria.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "nenhuma tabela de parti��es presente.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "estranho, somente %d parti��es est�o definidas.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "Aviso: a parti��o %s possui tamanho 0, mas n�o est� marcada como vazia\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Aviso: a parti��o %s possui tamanho 0 e � inicializ�vel\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Aviso: a parti��o %s possui tamanho 0 e in�cio diferente de zero\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Aviso: a parti��o %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
-msgstr "n�o est� contida na parti��o %s\n"
-
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Aviso: as parti��es %s "
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
+msgstr "Aviso: a parti��o %s cont�m parte da "
 
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "e %s se sobrep�em\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Aviso: a parti��o %d est� vazia\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Aviso: a parti��o %s come�a no setor 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Aviso: a parti��o %s se estende al�m do fim do disco\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 #, fuzzy
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr "Dentre as parti��es prim�rias, pelo menos uma pode ser estendida\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Aviso: a parti��o %s n�o inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Aviso: a parti��o %s n�o termina em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5468,7 +5467,7 @@ msgstr ""
 "Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5476,7 +5475,7 @@ msgstr ""
 "Aviso: normalmente o boot pode ser dado somente de parti��es prim�rias.\n"
 "O LILO desconsidera o flag `inicializ�vel'.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5485,12 +5484,12 @@ msgstr ""
 "Isto n�o faz diferen�a para o LILO, mas o MBR DOS n�o inicializar� este "
 "disco.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 #, fuzzy
 msgid "start"
 msgstr "status"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5498,162 +5497,162 @@ msgstr ""
 "parti��o %s - in�cio: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,"
 "%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 #, fuzzy
 msgid "end"
 msgstr "envio"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "parti��o %s - fim: (cil, cab, set) esperado (%ld,%ld,%ld) encontrado (%ld,"
 "%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "a parti��o %s termina no cilindro %ld, al�m do fim do disco\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, fuzzy, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr "Aviso: deslocamento inicia na parti��o extd de  %ld para %ld\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 #, fuzzy
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr "Aviso: a parti��o extendida n�o inicia em um limite de cilindro\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "n�mero excessivo de parti��es - ignorando aquelas al�m do n� %d\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "�rvore de parti��es?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Gerenciador de disco detectado - n�o � poss�vel tratar\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "Assinatura DM6 encontrada - desistindo\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "estranho... uma parti��o estendida de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "estranho... uma parti��o BSD de tamanho 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: parti��o n�o reconhecida\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "a op��o -n foi fornecida: nada foi alterado\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "N�o foi poss�vel salvar os setores antigos - abortando\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "linha de entrada longa demais ou incompleta - encerrando\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "erro de entrada: `=' esperado ap�s o campo %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "erro de entrada: caractere inesperado %c ap�s o campo %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "entrada n�o reconhecida: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "n�mero grande demais\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "lixo ap�s o n�mero\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "sem espa�o para o descritor da parti��o\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "n�o foi poss�vel criar a parti��o estendida envolt�ria\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "n�mero excessivo de campos de entrada\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "N�o h� espa�o para mais\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Tipo inv�lido\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Aviso: tamanho dado (%lu) excede o tamanho m�ximo permitido (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Aten��o: parti��o vazia\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Aviso: in�cio de parti��o inv�lido (mais adiantado %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "op��o de inicializa��o n�o reconhecida: selecione - ou *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "especifica��o cil,cab,set parcial?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Parti��o estendida n�o est� no lugar esperado\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "entrada inv�lida\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "N�mero excessivo de parti��es\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5665,103 +5664,183 @@ msgstr ""
 "Normalmente s� � necess�rio especificar <in�cio> e <tamanho> (e, talvez, "
 "<tipo>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Uso: %s [op��es] dispositivo ...\n"
+msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d parti��es:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "op��es perigosas:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -g [ou --show-geometry]: mostra a suposi��o do kernel sobre a geometria"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [ou --show-extended]: tamb�m lista parti��es estendidas na sa�da\n"
+"                             ou espera descritores para elas na entrada"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Uso:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s dispositivo\t\tlista parti��es as ativas no dispositivo\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s dispositivo n1 n2... ativa as parti��es n1..., deixando inativas as "
 "demais\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An dispositivo\n"
 " ativa a parti��o n, desativa as demais\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5770,62 +5849,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Use a op��o --force para cancelar todas as verifica��es.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "nenhum comando?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "total: %d blocos\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Uso: sfdisk --print-id dispositivo n�mero-parti��o\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "Uso: sfdisk --change-id dispositivo n�mero-parti��o ID\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "Uso: sfdisk --id dispositivo n�mero-parti��o [ID]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "pode especificar somente um dispositivo (exceto com -l ou -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, fuzzy, c-format
 msgid "cannot open %s read-write\n"
 msgstr "n�o foi poss�vel abrir %s\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, fuzzy, c-format
 msgid "cannot open %s for reading\n"
 msgstr "n�o foi poss�vel abrir %s para leitura"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cilindros, %ld cabe�as, %ld setores/trilha\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte ativo inv�lido: 0x%x em vez de 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5833,7 +5912,7 @@ msgstr ""
 "Conclu�do\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5842,35 +5921,35 @@ msgstr ""
 "Voc� possui %d parti��es prim�rias ativas. Isto n�o faz diferen�a para o\n"
 "LILO, mas o MBR DOS s� inicializar� em discos com uma parti��o ativa.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "a parti��o %s possui ID %x e n�o est� escondida\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "ID inv�lida: %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Este disco est� atualmente sendo usado.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Erro fatal: n�o foi poss�vel encontrar %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Aviso: %s n�o � um dispositivo de blocos\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Verificando se ningu�m est� usando este disco no momento...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5883,30 +5962,30 @@ msgstr ""
 "todas as parti��es de permuta deste disco. Use a op��o --no-reread para "
 "suprimir esta verifica��o.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Use a op��o --force para cancelar todas as verifica��es.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Situa��o antiga:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "A parti��o %d n�o existe; n�o � poss�vel alter�-la.\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Situa��o nova:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5914,21 +5993,21 @@ msgstr ""
 "Eu n�o gosto destas parti��es: nada foi alterado\n"
 "(se voc� realmente quiser us�-las, use a op��o --force).\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Eu n�o gosto disto - provavelmente voc� deveria responder N�o\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Voc� est� satisfeito com isto? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Deseja gravar isto no disco? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5937,16 +6016,16 @@ msgstr ""
 "\n"
 "sfdisk: final de entrada prematuro\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Saindo - nada foi alterado\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Responda y, n ou q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5955,7 +6034,7 @@ msgstr ""
 "Nova tabela de parti��es gravada com sucesso\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5988,101 +6067,102 @@ msgstr "Sincronizando discos.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+msgid "succeeded"
 msgstr ""
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "busca falhou"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: n�o foi poss�vel abrir %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: n�o encontrado"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "erro ao gravar %s: %s"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "For�ando verifica��o do sistema de arquivos em %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6090,58 +6170,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s desmontado\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Desmontando quaisquer sistemas de arquivos remanescentes..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Desmontando quaisquer sistemas de arquivos remanescentes..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6158,33 +6238,82 @@ msgstr "op��o longa vazia depois de argumento -l ou --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "interpretador de comandos desconhecido ap�s argumento -s ou --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [op��es] -o|--op��es texto_op��es [op��es] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            Permite op��es longas iniciando com um �nico "
+"-\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Mostra este pequeno guia de uso\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=ops_longas Op��es longas a serem reconhecidas\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=nome_prog         O nome sob o qual erros s�o reportados\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=texto_op��es     Op��es curtas a serem reconhecidas\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Desativa a exibi��o de erros por getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Sem sa�da normal\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=shell            Configura as conven��es de aspas do "
+"interpretador de comandos\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Teste de vers�o de getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 N�o quota a sa�da\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Mostra informa��es de vers�o\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "faltou o argumento texto_op��es"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "erro interno, entre em contato com o autor."
 
@@ -6655,92 +6784,110 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "N�o � poss�vel configurar o valor de epoch no kernel.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d parti��es:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                informa a hwclock o tipo de Alpha que voc� tem (consulte "
 "hwclock(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "N�o � poss�vel ajustar o rel�gio do sistema.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s n�o aceita argumentos que n�o sejam de op��o. Voc� forneceu %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6749,7 +6896,7 @@ msgstr ""
 "Voc� especificou m�ltiplas op��es de fun��o.\n"
 "Voc� s� pode executar uma fun��o por vez.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6758,7 +6905,7 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6767,7 +6914,7 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6776,27 +6923,27 @@ msgstr ""
 "%s: As op��es --utc e --localtime s�o mutuamente exclusivas. Voc� "
 "especificou ambas.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 "N�o h� um hor�rio para ajuste utiliz�vel. N�o � poss�vel ajustar o rel�gio.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Somente o superusu�rio pode alterar o rel�gio de hardware.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Somente o superusu�rio pode alterar o rel�gio de hardware.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6804,13 +6951,13 @@ msgstr ""
 "Somente o superusu�rio pode alterar o epoch do rel�gio de hardware no "
 "kernel.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "N�o � poss�vel acessar o Rel�gio de Hardware por nenhum m�todo conhecido.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -6993,7 +7140,7 @@ msgid "failed to read mtab"
 msgstr "n�o foi poss�vel stat %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "N�o foi poss�vel alocar buffer.\n"
@@ -7035,72 +7182,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: a montagem falhou"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "N�o foi poss�vel alocar buffer.\n"
@@ -7187,7 +7374,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: falha de PAM; abortando: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Senha:"
 
@@ -7633,47 +7820,48 @@ msgstr "Saltos de linha EXCESSIVOS"
 msgid "too many bare linefeeds."
 msgstr "N�mero excessivo de saltos de linha.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Tempo de login esgotado ap�s %d segundos\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "�ltimo login: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "a partir de %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "em: %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "A abertura de %s falhou"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "FALHA DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "FALHA DE LOGIN EM %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d FALHAS DE LOGIN A PARTIR DE %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d FALHAS DE LOGIN EM %s, %s"
@@ -7703,7 +7891,7 @@ msgstr "mount: permiss�o negada"
 msgid "setuid failed"
 msgstr "setuid() falhou"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "exec falhou\n"
@@ -7749,8 +7937,8 @@ msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: n�o foi poss�vel desbloquear %s: %s (as altera��es ainda est�o em %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "o fork falhou\n"
@@ -7803,24 +7991,21 @@ msgstr "valor de ano inv�lido: use 1-9999"
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "Uso: cal [-mjyV] [[m�s] ano]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7932,32 +8117,32 @@ msgstr " Remover"
 msgid "failed to add line to output"
 msgstr "N�o foi poss�vel alocar buffer.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "erro de busca"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "N�o foi poss�vel alocar buffer.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: n�o foi poss�vel ler %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "N�o foi poss�vel alocar buffer.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc falhou"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7968,91 +8153,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Comandos dispon�veis:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "O diret�rio %s n�o existe!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "N�o foi poss�vel alocar buffer.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "N�o foi poss�vel alocar buffer.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "N�o foi poss�vel alocar buffer.\n"
@@ -8077,12 +8287,12 @@ msgstr "%s: n�o foi poss�vel localizar o processo \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: sinal desconhecido %s; sinais v�lidos:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "Uso: %s [ -s sinal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ sinal ]\n"
@@ -8102,84 +8312,83 @@ msgstr "TamBloco: %d\n"
 msgid "connect %s"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs socket"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "n�mero `%s' a `%s' fora do intervalo\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: nome de recurso desconhecido: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: nome de prioridade desconhecido: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8317,7 +8526,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8335,12 +8544,13 @@ msgstr "%s: n�o foi poss�vel abrir %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8348,7 +8558,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8371,40 +8581,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Obtidos %d bytes de %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "exec falhou\n"
@@ -8424,24 +8634,12 @@ msgstr "n�o foi poss�vel verificar status de dispositivo %s"
 msgid "%s - No such file or directory\n"
 msgstr "inode raiz n�o � um diret�rio"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "Uso: namei [-mx] nome_caminho [nome_caminho ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d parti��es:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8453,19 +8651,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "fsname nome muito longo"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8475,169 +8672,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: n�o foi poss�vel renomear %s para %s. falha: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: argumento inv�lido para -l %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Gravar"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "read %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "n�o foi poss�vel stat %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "N�o foi poss�vel abrir %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "N�o foi poss�vel abrir %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Erro ao ler %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "id inv�lido: %s\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "id inv�lido: %s\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "N�mero inv�lido: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8645,29 +8840,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8701,43 +8895,44 @@ msgid "%s: write failed"
 msgstr "openpty falhou\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "bytes"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8835,63 +9030,63 @@ msgstr "erro ao alterar o modo de %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "n�o foi poss�vel renomear %s para %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: usu�rio \"%s\" n�o existe.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: n�o foi poss�vel obter informa��es sobre o dispositivo %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr "Tipo de criptografia n�o suportado: %s\n"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, fuzzy, c-format
 msgid ", encryption type %d\n"
 msgstr "Tipo de criptografia n�o suportado: %s\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: n�o foi poss�vel obter informa��es sobre o dispositivo %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: n�o foi poss�vel abrir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "mount: n�o foi poss�vel localizar nenhum dispositivo de la�o livre"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, fuzzy, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8902,56 +9097,54 @@ msgstr ""
 "       este kernel n�o conhece o dispositivo de la�o\n"
 "       (se for este o caso, recompile ou use `insmod loop.o')."
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Falta mem�ria quando o buffer cresce.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "O setor %d j� est� alocado\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s � protegido contra grava��o; montando somente para leitura"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "N�o � poss�vel bloquear (lock) na mem�ria, saindo\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%d): sucesso\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): sucesso\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: n�o foi poss�vel excluir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Este mount foi compilado sem suporte a la�os. Recompile-o.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8959,7 +9152,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "usage:\n"
 "  %s dispositivo_la�o                                                 # d� "
@@ -8969,48 +9162,45 @@ msgstr ""
 "  %s [ -e criptografia ] [ -o deslocamento ] dispositivo_la�o arquivo # "
 "configura��o\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: n�o foi poss�vel abrir o dispositivo %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: o dispositivo est� ocupado"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "N�o havia suporte a la�o dispon�vel quando da compila��o. Recompile.\n"
@@ -9559,163 +9749,166 @@ msgstr "erro na chamada a xstrndup"
 msgid "not enough memory"
 msgstr "n�o h� mem�ria suficiente"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "exec falhou\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() falhou"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "A abertura de %s falhou"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Nome"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "swapon: aviso: %s possui permiss�es inseguras %04o; sugere-se 0600\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "swapon: aviso: %s possui permiss�es inseguras %04o; sugere-se 0600\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "swapon: ignorando arquivo %s - ele parece ter buracos.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s em %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: n�o foi poss�vel localizar \"_stext\" em %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "N�o definido\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "busca falhou"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9992,7 +10185,7 @@ msgstr "Aviso: excluindo parti��es ap�s %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr "Aviso: excluindo parti��es ap�s %d\n"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10052,19 +10245,13 @@ msgstr "   p   mostra a tabela de parti��es BSD"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "O disco %s n�o cont�m uma tabela de parti��es v�lida\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10075,47 +10262,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Comandos dispon�veis:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "N�o foi poss�vel alocar buffer.\n"
@@ -10243,7 +10429,7 @@ msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 msgid "failed to set pid %d's policy"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
@@ -10515,7 +10701,7 @@ msgstr "%s: %ld � o limiar %s e %ld � o tempo-limite %s\n"
 msgid "Can't set signal handler"
 msgstr "N�o foi poss�vel configurar manipulador de sinal"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday falhou"
 
@@ -10524,7 +10710,7 @@ msgstr "gettimeofday falhou"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "N�o foi poss�vel emitir CYGETMON em %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, fuzzy, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10532,12 +10718,12 @@ msgstr ""
 "%s: %lu ints, %lu chars; fifo: %lu limiar, %lu tempo-limite, %lu m�x, %lu "
 "agora\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f int/s; %f recebidos, %f enviados (char/s)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10545,7 +10731,7 @@ msgstr ""
 "%s: %lu ints, %lu chars; fifo: %lu limiar, %lu tempo-limite, %lu m�x, %lu "
 "agora\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/s; %f recebidos (char/s)\n"
@@ -10637,124 +10823,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Uso: %s [op��es] dispositivo ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: comando desconhecido: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "O diret�rio %s n�o existe!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync falhou"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "nenhum comando?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync falhou"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10762,43 +10931,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "N�mero excessivo de argumentos.\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Valor definido inv�lido: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "N�o. Op��o --date especificada\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "n�mero m�ximo de segmentos: %ld\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty falhou\n"
@@ -10806,100 +10975,100 @@ msgstr "openpty falhou\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s exige um argumento\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: n�o foi poss�vel abrir %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "N�mero inv�lido: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "o fork falhou\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "N�o. Op��o --date especificada\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "N�o. Op��o --date especificada\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "busca falhou"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "inode raiz n�o � um diret�rio"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "openpty falhou\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "openpty falhou\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10908,101 +11077,92 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "N�o. Op��o --date especificada\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "inode raiz n�o � um diret�rio"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "openpty falhou\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Uso: %s [op��es] dispositivo ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "As informa��es de finger foram alteradas.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Mem�ria compartilhada: shmid de segmento = %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "msqid da fila de mensagens: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "sem�foros alocados: %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11499,8 +11659,8 @@ msgstr ""
 "Mem�ria compartilhada: shmid de segmento = %d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11510,7 +11670,7 @@ msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
 #, fuzzy, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%d\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11543,8 +11703,8 @@ msgstr ""
 "msqid da fila de mensagens: %d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11577,8 +11737,8 @@ msgstr ""
 "semid de array de sem�foros: %d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11626,71 +11786,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "id inv�lido: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s n�o � um dispositivo de blocos especial"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "N�o foi poss�vel realizar busca na unidade de disco"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "N�o foi poss�vel obter o tamanho de %s"
@@ -11845,48 +12003,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "inode raiz n�o � um diret�rio"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s est� montado.\t"
@@ -11918,55 +12071,50 @@ msgstr ""
 "\t -r            reinicializa todos os contadores (somente root)\n"
 "\t -V            mostra a vers�o e sai\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: erro ao gravar %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Passo de amostragem: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): linha de mapa incorreta\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: n�o foi poss�vel localizar \"_stext\" em %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "total"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11975,238 +12123,229 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s de %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: comando desconhecido: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "bad timeout value: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "usu�rio"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: prioridade antiga = %d; prioridade nova = %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Uso: %s [op��es] dispositivo ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "leitura/grava��o"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "sem�foros alocados: %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "Erro no fechamento de %s\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "busca falhou"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "leitura/grava��o"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "gettimeofday falhou"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: parti��o n�o reconhecida\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Usando %s.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Usando %s.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s n�o � um dispositivo lp.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Mensagem de %s@%s em %s em %s ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Mensagem de %s@%s em %s em %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12257,17 +12396,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr "Tente `getopt --help' para maiores informa��es.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: parti��o n�o reconhecida\n"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "N�mero excessivo de argumentos.\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "N�o foi poss�vel gravar a parti��o em %s\n"
@@ -12352,173 +12491,171 @@ msgstr "%s usando IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s usando consulta (polling)\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "Uso: %s programa [arg ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "busca falhou"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: cant exec %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "erro ao alterar o modo de %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: n�o foi poss�vel localizar o processo \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: cant exec %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "N�o foi poss�vel alocar buffer.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "bad timeout value: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "N�mero excessivo de argumentos.\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "N�o foi poss�vel alocar buffer.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "velocidade inv�lida: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "n�mero excessivo de velocidades alternativas"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: n�o foi poss�vel abrir como entrada padr�o: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s n�o � um dispositivo de caracteres"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: n�o est� aberto para leitura/grava��o"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: problema de dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "tipo: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: leitura: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: entrada excedida"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12530,69 +12667,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "usu�rio"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "usu�rios"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "busca falhou"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "� y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "� n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "sem�foros alocados: %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "id inv�lido: %s\n"
@@ -12608,52 +12739,46 @@ msgstr ""
 "Use `%s [op��es] %s' se voc� realmente quer usar isto.\n"
 "Script n�o iniciado.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "N�o foi poss�vel abrir o arquivo '%s'"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script iniciado, o arquivo � %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script iniciado em %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: n�o foi poss�vel localizar \"_stext\" em %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12662,80 +12787,77 @@ msgstr ""
 "\n"
 "Script conclu�do em %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script conclu�do, o arquivo � %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty falhou\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "ptys esgotados\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "A abertura de %s falhou"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "n�mero m�ximo de segmentos: %ld\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "N�o foi poss�vel abrir o arquivo '%s'"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() n�o conseguiu ler a hora de /dev/tty1"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr ""
@@ -12746,111 +12868,108 @@ msgid "Argument error."
 msgstr "%s: erro de argumento; uso\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "As informa��es de finger foram alteradas.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "n�o foi poss�vel realizar fork"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "n�o foi poss�vel realizar fork"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "n�o foi poss�vel abrir %s %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "n�o � poss�vel alterar o estado do modo de conserva��o de energia\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "n�o foi poss�vel abrir o dispositivo %s para grava��o\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "erro de klogctl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Erro ao gravar descarga de tela\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM indefinido.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: sinal desconhecido %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12878,142 +12997,144 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Uso: %s [op��es] dispositivo ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "id inv�lido: %s\n"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "bad timeout value: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: n�o foi poss�vel abrir arquivo tempor�rio.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: n�o foi poss�vel configurar velocidade: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "N�o foi poss�vel obter o tamanho do disco"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Mensagem de broadcast de %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: n�o ser� lido %s - use a entrada padr�o.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "busca falhou"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "Uso: namei [-mx] nome_caminho [nome_caminho ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: n�o foi poss�vel localizar o nome do tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: sua permiss�o de grava��o est� desativada.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s n�o est� conectado em %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s - mensagens desativadas em %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s n�o est� conectado.\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s - mensagens desativadas\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s est� conectado mais de uma vez; escrevendo para %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Linha de entrada longa demais.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Mensagem de %s@%s (como %s) em %s em %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Mensagem de %s@%s em %s em %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "malloc falhou"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13192,7 +13313,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13370,7 +13491,7 @@ msgstr ""
 "\n"
 "Padr�o n�o encontrado\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Padr�o n�o encontrado"
 
@@ -13437,7 +13558,7 @@ msgstr "hexdump: formato inv�lido{%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: caractere de convers�o inv�lido %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13465,95 +13586,95 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, fuzzy, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "a op��o `%s' exige um argumento\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, fuzzy, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: n�o foi poss�vel abrir %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 #, fuzzy
 msgid "...skipping forward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 #, fuzzy
 msgid "...skipping backward\n"
 msgstr "...pulando\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 #, fuzzy
 msgid "No next file"
 msgstr "(Pr�ximo arquivo: %s)"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 #, fuzzy
 msgid "No previous file"
 msgstr "Nenhuma parti��o definida\n"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, fuzzy, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: erro de leitura em %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, fuzzy, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: erro de procura em %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, fuzzy, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: n�o foi poss�vel ler arquivo tempor�rio.\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 #, fuzzy
 msgid "RE error: "
 msgstr ", erro"
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 #, fuzzy
 msgid "Cannot open "
 msgstr "N�o foi poss�vel abrir %s\n"
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 #, fuzzy
 msgid "saved"
 msgstr "envio"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 #, fuzzy
 msgid "fork() failed, try again later\n"
 msgstr "A senha *N�O* foi alterada. Tente novamente mais tarde.\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 #, fuzzy
 msgid "(Next file: "
 msgstr "(Pr�ximo arquivo: %s)"
@@ -13622,8 +13743,8 @@ msgstr "Uso: %s [op��es] dispositivo ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13639,40 +13760,107 @@ msgstr "%s: n�o foi poss�vel abrir %s\n"
 msgid "no input file specified"
 msgstr "N�o. Op��o --date especificada\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Uso: %s [op��es] dispositivo ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "problemas na leitura de terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Seq��ncia de escape desconhecida na entrada: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Linha de entrada longa demais.\n"
 
 #, fuzzy
-#~ msgid "Usage:\n"
-#~ msgstr "Uso:"
+#~ msgid "closing file %s"
+#~ msgstr "Erro no fechamento de %s\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr ""
+#~ "Desculpe. Voc� pode alterar apenas a etiqueta de parti��es n�o vazias.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Aviso: a parti��o %s "
+
+#~ msgid "is not contained in partition %s\n"
+#~ msgstr "n�o est� contida na parti��o %s\n"
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Aviso: as parti��es %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "e %s se sobrep�em\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "dispositivo: algo como /dev/hda ou /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "bytes"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uso: %s [op��es] dispositivo ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Uso: %s [op��es] dispositivo ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13822,29 +14010,11 @@ msgstr "Linha de entrada longa demais.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [ou --help]:      mostra esta mensagem"
 
-#~ msgid "dangerous options:"
-#~ msgstr "op��es perigosas:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [ou --show-geometry]: mostra a suposi��o do kernel sobre a "
 #~ "geometria"
 
-#, fuzzy
-#~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -g [ou --show-geometry]: mostra a suposi��o do kernel sobre a "
-#~ "geometria"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [ou --show-extended]: tamb�m lista parti��es estendidas na sa�da\n"
-#~ "                             ou espera descritores para elas na entrada"
-
 #~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
@@ -13905,56 +14075,9 @@ msgstr "Linha de entrada longa demais.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [op��es] [--] texto_op��es par�metros\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [op��es] -o|--op��es texto_op��es [op��es] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              par�metros\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Permite op��es longas iniciando com um "
-#~ "�nico -\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Mostra este pequeno guia de uso\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=ops_longas Op��es longas a serem reconhecidas\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=nome_prog         O nome sob o qual erros s�o reportados\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr ""
-#~ "  -o, --options=texto_op��es     Op��es curtas a serem reconhecidas\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Desativa a exibi��o de erros por getopt"
-#~ "(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Sem sa�da normal\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=shell            Configura as conven��es de aspas do "
-#~ "interpretador de comandos\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Teste de vers�o de getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 N�o quota a sa�da\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Mostra informa��es de vers�o\n"
-
 #, fuzzy
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (melhorado) 1.1.0)\n"
@@ -15262,9 +15385,6 @@ msgstr "Linha de entrada longa demais.\n"
 #~ msgid "BSD/386"
 #~ msgstr "BSD/386"
 
-#~ msgid "Warning: partition %s contains part of "
-#~ msgstr "Aviso: a parti��o %s cont�m parte da "
-
 #~ msgid "and will destroy it when filled\n"
 #~ msgstr "e destruir� a tabela quando cheia\n"
 
diff --git a/po/ru.po b/po/ru.po
index b97f4ff66..fec3ef04d 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2006-03-07 12:42+0200\n"
 "Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -110,29 +110,29 @@ msgstr "���������� ������� ��������"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "�������� ������ � ������"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "���������� ������� %s"
@@ -211,7 +211,7 @@ msgid "Verifying ... "
 msgstr "����������� �������� ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "���������� ������� ���� '%s'"
@@ -251,15 +251,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -272,7 +272,7 @@ msgstr "%s �� %s\n"
 msgid "cannot stat file %s"
 msgstr "���������� ���������� ��������� ���������� %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -321,8 +321,8 @@ msgid "stat failed: %s"
 msgstr "(��������� ����: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty ���������� ��������\n"
@@ -553,55 +553,55 @@ msgstr "%s: �������� cramfs - ��������� �������� ������ �����\n"
 msgid "compiled without -x support"
 msgstr "%s: �������������� ��� ��������� -x\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: ��\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "�������������: %s [-larvsmf] /dev/���\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s �������������.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "�� ������������� ������ ����������"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "�������� ��������.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "���� nr < FIRSTZONE � ����� `%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "���� nr >= ZONES � ����� `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "������� ����"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "������ ������: ���������� ����� ���� � ����� '%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "������ ������: ��������� ���� � ����� '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -610,296 +610,296 @@ msgstr ""
 "���������� ������: ������� �������� ��������� ����\n"
 "������ �� ������ ��������������\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "����� � write_block ���������� ��������"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "������ ������: �������� ���� � ����� '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "����� � write_super_block ���������� ��������"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "���������� �������� ���������"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "���������� �������� ����� inode"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "���������� �������� ����� zone"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "���������� �������� inode'�"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "����� ���������� ��������"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "���������� �������� ������ ��� ����"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "���������� ��������� ���������"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "�������� ���������� ����� � ����������"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "�������������� ������ 1k �����/����"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "�������� ���� s_imap_blocks � ����������"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "�������� ���� s_zmap_blocks � ����������"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "���������� ���������� ����� ��� ����� inode"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "���������� ���������� ����� ��� ����� inode"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "���������� ���������� ����� ��� inode'��"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "���������� �������� ����� ��� ����� inode"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "���������� �������� ����� ��� ����� ���"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "���������� ��������� ����� inode"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "���������� ��������� ����� ���"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "���������� ��������� inode'�"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "��������������: ������ ���� != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inode'��\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld ������\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "������ ���� ������=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "������ ����=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "����. ������=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "��������� �������� �������=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "����� �����=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d ������� ��� ��������������, �� ������������ ������ '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "��������, ��� ������������"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "���� `%s' ��������� � ������ %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "��������������: ����� inode ������� ������.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "�������� inode �� �������� ���������"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "���� ��� ����������� �����. ������ � ����� `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "��������"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "���� %d � ����� `%s' ������� ��� ��������������."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "���������"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "������� '%s' �������� �������� ����� inode ��� ����� '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " �������"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: �������� �������: '.' �� ������\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: �������� �������: '..' �� ������\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "���������� ������"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: �������� �������: ������ < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "����� � bad_zone ���������� ��������"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "����� inode %d �� ������."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inode %d �� ������������, ������� ��� ������������ � bitmap'�."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inode %d ������������, ������� ��� �������������� � bitmap'�."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "���������"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (����� = %07o), i_nlinks=%d, counted=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "��������� i_nlinks'� �����"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "���� %d: �������� ��� ������������, �� ������������ �� ������ ���."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "����� �����"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "���� %d: ������������, counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "���� %d: �� ������������, counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "�������� ������ inode"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "�������� ������ v2 inode"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "����� �������� ��� �������������� �����������"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "���������� ������� '%s'"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s ����, �������� �� �����.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "����������� �������� �������� ������� �� %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "�������� ������� �� %s ����������, ����� ��������.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -908,12 +908,12 @@ msgstr ""
 "\n"
 "������������ %6ld inodes (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "������������ %6ld ��� (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -936,7 +936,7 @@ msgstr ""
 "------\n"
 "%6d ������\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1060,7 +1060,7 @@ msgstr "������� ����� inode'��, �������� - 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "�� ������� �����, ����� ��� ������� %lu ������"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "����������: %s\n"
@@ -1231,10 +1231,8 @@ msgstr "%6.2f%% (%+d ����)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"������ �������� �����\n"
+msgid "cannot close file %s"
+msgstr "���������� ������� ���� '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1348,88 +1346,98 @@ msgstr ""
 "��������������: ����� ��������� ��������� �� %u ���.  ��� �����������\n"
 "������ ��������, ��� ��������� ����� ��������� ���� �������.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "�������������: %s [-c | -l ���_�����] [-nXX] [-iXX] /dev/��� [�����]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s �������������; �� ���������� ����� �������� �������!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "����� ������������ ����� � write_tables ���������� ��������"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "���������� �������� ����������� ������"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "����� � write_tables ���������� ��������"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "���������� �������� ���������"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "���������� �������� ����� inode"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "���������� �������� ����� ���"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "���������� �������� inode'�"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "����� � write_block ���������� ��������"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "������ � write_block ����������� ��������"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "������� ����� ������ ������"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "�� ������� ������� ������"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "���������� �������� ������ ��� ����"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "���������� �������� ������ ��� ����"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "���������� �������� ������ ��� inodes"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inode'��\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld ������\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1438,97 +1446,97 @@ msgstr ""
 "����. ������=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "����� �� ����� �������� ������ ���������� ��������"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "���������� �������� � do_check: �������� ����\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "����� � check_blocks ���������� ��������"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "������ ����� ����� data-area: ���������� ������� ��"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d ������ ������\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "���� ������ ����\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "���������� ������� ���� ������ ������"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "���������� ��������� � ��������� ����������"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "�������� ������ inode"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "������ strtol: ���������� ������ �� ������"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "����� ���������� ��������"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty ���������� ��������\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: ���������� ������"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "���������� �������� ������ %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "������� ������� �������� ������� �� '%s' ��������� �� �����"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "���������� ��������"
@@ -1869,7 +1877,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "����� � write_tables ���������� ��������"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2212,7 +2220,7 @@ msgid "   Logical"
 msgstr "   ����������"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "�����������"
 
@@ -2879,12 +2887,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "������� ����� ����� BSD (m ��� �������): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "������ %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "��������� %s ��� +size ��� +sizeM ��� +sizeK"
@@ -3030,7 +3038,7 @@ msgid "tracks/cylinder"
 msgstr "�������/�������"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "��������"
 
@@ -3097,12 +3105,12 @@ msgstr "���� ������� ����������� ��������� ���������� ��������\n"
 msgid "This partition already exists.\n"
 msgstr "���� ������ ��� ����������.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "��������������: ������� ����� �������� (%d, �������� - %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3306,7 +3314,7 @@ msgstr "�� ������ ����������"
 msgid "heads"
 msgstr "�������"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "�������"
 
@@ -3741,7 +3749,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s ����     ������       �����       �����   Id  �������\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "����-��"
 
@@ -3826,7 +3834,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld ��������� ��������\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3989,38 +3997,38 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "���������������� �����.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "������ %d �� ����� ������� � �������\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "����� ������ ������"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "������� �������� (m ��� �������): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "���������� ���������"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "���������� �������"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "���������� ��������"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 "��������������: ��������������� �������� ������� ��� ������������� � DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4029,32 +4037,32 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "�� ����� %s ����������� ������ ������� ��������\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "���������� ������� %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: ����������� �������\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "��� ���� ���� ������� ������ ������� - ����� -b ���������������\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4063,18 +4071,18 @@ msgstr ""
 "��������������: ����� -b (��������� ������� �������) ������ ���� "
 "������������ � ����� ��������� �����������\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "���������� ����� ����� OSF/1 �� %s, ����������� ������� � ����� ����� "
 "�����.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "������� (m ��� �������): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4083,16 +4091,16 @@ msgstr ""
 "\n"
 "������� boot-����: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "����������, ������� ��� ������ boot-�����: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Boot-���� �� �������\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4418,9 +4426,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\t�� ������� ��������� ��� boot-�����.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "� ��������� �� ������ �������� ��� �������� ��������.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "� ��������� ������ ����������������� ����� �������� ��������� ����.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4437,7 +4445,7 @@ msgstr ""
 "������ ������ ����� ����� \"SGI volume\" ����� �������� ���.\n"
 "������� ��, ���� �� �������, ��� ��������� ���� ������ ��������.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "��\n"
 
@@ -4642,7 +4650,7 @@ msgstr "�������������� ���������� - ������� 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "�������������� ���������� - ������� %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4651,7 +4659,7 @@ msgstr ""
 "������ ������� ��� ���������� ���� ����.\n"
 "������� ��������� ��� ��������� �� ����� ��������� ��������.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4660,12 +4668,12 @@ msgstr ""
 "������������ �������������, ����� ������������\n"
 "������ ��������� ���� ���� � ���� ��� `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "������ %d ��� �������\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4676,7 +4684,7 @@ msgstr ""
 "%d %s ��������� ������ ������. ��� ����� ��� �������\n"
 "�� %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4685,7 +4693,7 @@ msgstr ""
 "���� �� ������ ������������ ������������� � SunOS/Solaris, ������������\n"
 "�������� ���� ������ ��� ���� disk (5), ������� � 0, � %u ���������\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4701,7 +4709,7 @@ msgstr ""
 "�������, ��� ������ �������� ���� ������ ��� 82\n"
 "82 (Linux ����): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4721,7 +4729,7 @@ msgstr ""
 "������� = %s �� %d * 512 ����\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4734,28 +4742,28 @@ msgstr ""
 "������� = %s �� %d * 512 ����\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s ����   ������     �����     �����   Id  �������\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "���������� �������������� ���������"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "�������������� ������� �� �������"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "����������� �����������"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "�������� �������� (��/���)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "���������� ���������� ���������"
 
@@ -5215,7 +5223,7 @@ msgstr "���� %s: ���������� �������� ���������\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "���� %s: ���������� �������� ������\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5227,23 +5235,23 @@ msgstr ""
 "�������� �� ����� ������.\n"
 "[����������� ����� --force, ���� �� ������������� ������ �����]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "��������������: HDIO_GETGEO �������, ��� ������� %lu �������\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "��������������: HDIO_GETGEO �������, ��� ������� %lu ��������\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 "��������������: BLKGETSIZE/HDIO_GETGEO �������, ��� ������� %lu ���������\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5252,7 +5260,7 @@ msgstr ""
 "��������������: ������������� ���������� �������� (%lu) - ������ �� 63\n"
 "��� ������� �������� � ���� ��������, ������������ ��������� C/H/S.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5261,7 +5269,7 @@ msgstr ""
 "\n"
 "���� %s: %lu ���������, %lu �������, %lu ��������/�������\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5269,7 +5277,7 @@ msgstr ""
 "%s ������� %s ����� ����������� �������� ��� �������: %lu (������ ���� ����� "
 "0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5278,7 +5286,7 @@ msgstr ""
 "%s ������� %s ����� ����������� �������� ��� �������: %lu (������ ���� ����� "
 "1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5287,7 +5295,7 @@ msgstr ""
 "%s ������� %s ����� ����������� �������� ��� ���������: %lu (������ ���� "
 "����� 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5296,12 +5304,12 @@ msgstr ""
 "Id  ���\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "�������������� ������� ��������...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5312,26 +5320,26 @@ msgstr ""
 "����������� ��������. ����������� ����\n"
 "������� ����� �������������� mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "������ �������� %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: ��� ������ �������\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "�������������� ������ - ������������ �������\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "��������������� ������ - ������������ %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5340,12 +5348,12 @@ msgstr ""
 "������� = �������� �� %lu ����, ����� �� 1024 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "  ����-�� ����   ���   �����    #���     #�����   Id  �������\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5354,12 +5362,12 @@ msgstr ""
 "������� = ������� �� 512 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "  ����-�� ����   ������     �����   #�������  Id  �������\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5368,12 +5376,12 @@ msgstr ""
 "������� = ����� �� 1024 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "  ����-�� ����  ������     �����     #�����   Id  �������\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5382,31 +5390,31 @@ msgstr ""
 "������� = mebi-����� �� 1048576 ����, ����� �� 1024 ����, ������� � %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "  ����-�� ����   ��� �����    �iB     #�����   Id  �������\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t������: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t�����: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "������ ������������� �� �������� %ld, ����� ����� �����\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "������� �� �������\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5418,53 +5426,43 @@ msgstr ""
 "(������ %ld/%ld/%ld).\n"
 "��� �������� ����� ��������������� ��� ���������.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "������� �������� �����������.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "�������, ���������� ������ ������� %d.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 "��������������: ������ %s ����� ������� ������, �� �� �� ������� ��� ������\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 "��������������: ������ %s ����� ������� ������ � �������� �����������\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "��������������: ������ %s ����� ������� ������ � ��������� ������\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "��������������: ������ %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "�� ��������� � ������� %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "��������������: ������� %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "� ������������� � %s\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "��������������: ������ %d ����\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5473,17 +5471,17 @@ msgstr ""
 "��������������: ������ %s �������� ����� ������� �������� (������ %lu),\n"
 "� �������� �� ��� ����������\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "��������������: ������ %s ���������� � �������� �������\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "��������������: ������ %s ������������� �� ����� �����\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5491,17 +5489,17 @@ msgstr ""
 "����� �������� �������� �������� ������ ���� �����\n"
 "���� �������� (��� �� �����, ��� Linux ��� �� ��������)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "��������������: ������ %s �� ���������� �� ������� ��������\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "��������������: ������ %s �� ������������� �� ������� ��������\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5509,7 +5507,7 @@ msgstr ""
 "��������������: ����� ������ ������� �������� ��� ����������� (��������)\n"
 "��� �� ����� �������� ��� LILO, �� DOS'������ MBR �� �������� ���� ����.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5518,7 +5516,7 @@ msgstr ""
 "��������\n"
 "LILO ���������� ���� `�����������'.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5527,33 +5525,33 @@ msgstr ""
 "(��������)\n"
 "��� �� ����� �������� ��� LILO, �� DOS'������ MBR �� �������� ���� ����.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "������"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "������ %s: ������: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "�����"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "������ %s: �����: (c,h,s) ��������� (%ld,%ld,%ld) ������� (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "������ %s ������������� �� �������� %ld, ����� ����� �����\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5562,7 +5560,7 @@ msgstr ""
 "��������������: ������ ������������ ������� �������� � %ld �� %ld\n"
 "(������ ��� ������ ��������, ��� ��������� ��� �����������.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5570,133 +5568,133 @@ msgstr ""
 "��������������: ����������� ������ �� ���������� �� ������� �������.\n"
 "DOS � Linux ����� ���������������� ���������� ��-������.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "������� ����� �������� - ������������ ��� ��������� ������ (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "������ ��������?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "��������� �������� ������ - ���������� ����������\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "������� ��������� DM6  - ������\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "�������... ����������� ������ �������� �������?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "�������... ������ BSD �������� �������?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: �������������� ��� ������� ��������\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "��� ������ ���� -n: ������ �� ��������\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "������ ���������� ������ �������� - ����������� ����������\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "������ ������ ������� �� %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "������� ��� ������������� ������ ����� - ����������� �����\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "������ �����: `=' �������� ����� ���� %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "������ �����: ����������� ������ %c ����� ���� %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "�������������� ����: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "����� ������� �������\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "����� ����� �����\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "��� ����� ��� ����������� �������\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "���������� ������� ���������� ����������� ������\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "������� ����� ����� �����\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "����� ������ ���\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "�������� ���\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "��������������: ��������� ������ (%lu) ��������� ����������� ���������� "
 "������ (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "��������������: ������ ������\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "��������������: �������� ������ ������� (����� %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "������������� ����������� ���� - �������� - ��� *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "��������� ������������ c,h,s?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "����������� ������ �� ���, ��� ��������\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "�������� ����\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "������� ����� ��������\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5708,100 +5706,182 @@ msgstr ""
 "������ ��� ���������� ������ ������� <������> � <������> (� �������� "
 "<���>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "�������������: %s [�����] ����������...\n"
+msgstr "�������������:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "����������: ���-�� ����� /dev/hda ��� /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "�������������: %s [�����] ����������...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d �������:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "������� �����:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [��� --show-pt-geometry]: ����� ���������, ���������� �� ������� "
+"��������"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [��� --show-extended]: ����� ����� ������ ����������� �������� �� "
+"������\n"
+"                              ��� ��������� ����������� ��� ��� �� �����"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "�������������:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s ����������\t\t ������� ������ �������� �������� ����������\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s ���������� n1 n2 ... ���������� ������� n1 ... � ������������� ���������\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -���������� \t ���������� ������ n, ������������� ������ �������\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5810,62 +5890,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "����������� ���� --force ��� ���������� ���� ��������.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "��� �������?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "�����: %llu ������\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "�������������: sfdisk --print-id ���������� �����_�������\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "�������������: sfdisk --change-id ���������� �����_������� Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "�������������: sfdisk --id ���������� �����_������� [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "����� ������� ������ ���� ���������� (����� ���, ��� �  -l ��� -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "���������� ������� %s ��� ������-������\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "���������� ������� %s ��� ������\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld ���������, %ld �������, %ld ��������/�������\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "���������� �������� ������ %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "�������� active-����: 0x%x ������ 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5873,7 +5953,7 @@ msgstr ""
 "������\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5882,35 +5962,35 @@ msgstr ""
 "� ��� ������� %d �������� �������� �������. ��� �� ����� �������� ��� LILO,\n"
 "�� DOS'������ MBR �������� ������ ���� � ����� �������� ��������.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "������ %s ����� id %x � �� �������� �������\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "�������� Id %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "���� ���� ������ ������������.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "������������ ������: ���������� ����� %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "��������������: %s �� �������� ������� �����������\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "�����������, ����� ������ ����� �� ����������� ���� ����...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5923,30 +6003,30 @@ msgstr ""
 "�����.\n"
 "����������� ���� --no-reread ��� ������ ���� ��������.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "����������� ���� --force ��� ���������� ���� ��������.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "��\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "������ ��������:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "������ %d �� ����������, ���������� �������� ���\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "����� ��������:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5954,21 +6034,21 @@ msgstr ""
 "�� �������� ��� ��� ������� - ������ �� ��������.\n"
 "(���� �� ������������� ������ �����, ����������� ����� --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "�� �������� ��� ��� - ��������, ��� ������� �������� ���\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "��� ���������� ����� �������? [���] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "�� ������ �������� ��� �� ����? [���] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5977,16 +6057,16 @@ msgstr ""
 "\n"
 "sfdisk: ��������������� ��������� �����\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "���������� ������ - ������ �� ��������\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "����������, �������� �, � ��� �\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5995,7 +6075,7 @@ msgstr ""
 "����� ������� �������� ������� ��������\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6028,101 +6108,103 @@ msgstr "���������������� �����.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s �������� �������.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "����� ���������� ��������"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: ���������� ������� %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: �� ������"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: ������ %d ��� ����������! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s �� lp-����������.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "����������� �������� �������� ������� �� %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6130,58 +6212,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s �� lp-����������.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "���������� ������� %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s �������������\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "�������������� ��� ���������� �������� �������..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "�������������� ��� ���������� �������� �������..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: ����������� ��������: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6198,33 +6280,83 @@ msgstr "������ ����� long ����� ��������� -l ��� --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "����������� ���� ����� ��������� -s ��� --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [�����] -o|--options ������_����� [�����] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            ���������� ������� �����, ������������ � "
+"������ -\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr ""
+"  -h, --help                   ��� ��������� ����������� �� �������������\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=longopts   ������� ����� ��� �������������\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=���_���������     ���, �� �������� ������� ����� �� �������\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=������_�����   �������� ����� ��� �������������\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  ���������� ������ �� ������� getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           ��� ������� �������� ������\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=����             ��������� ������� ����. � ������� ��� �����\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   �������� ������ getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr ""
+"  -u, --unqote                 �� ��������� � ������� �������� ������\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                ����� ���������� � ������\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "����������� �������� ������ �����"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "���������� ������, ��������� � �������."
 
@@ -6691,91 +6823,109 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "���������� ���������� � ���� �������� ����.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d �������:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                �������� hwclock'� ��� ����� alpha (��. hwclock(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "���������� ���������� ��������� ����.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ��������� �������������� ���������.  ��� ������������� %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6784,7 +6934,7 @@ msgstr ""
 "�� ������� ��������� �������.\n"
 "�� ������ ��������� ������ ���� ������� �� ���.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6793,7 +6943,7 @@ msgstr ""
 "%s: ����� --utc � --localtime �������� ������� ������������. � �� ������� "
 "���.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6802,7 +6952,7 @@ msgstr ""
 "%s: ����� --adjust � --noadjfile �������� ������� ������������. � �� ������� "
 "���.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6811,28 +6961,28 @@ msgstr ""
 "%s: ����� --adjust � --noadjfile �������� ������� ������������. � �� ������� "
 "���.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: � --noadjfile �� ������ ������� ���� --utc, ���� --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 "����������� ��������� ��� ��������� �����. ���������� ���������� ����.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "� ��������� ������ ����������������� ����� �������� ���������� ����.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "� ��������� ������ ����������������� ����� �������� ��������� ����.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6840,14 +6990,14 @@ msgstr ""
 "� ��������� ������ ����������������� ����� �������� � ���� ��� ���������� "
 "�����.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "���������� �������� ������ � ���������� ����� ����� �� �� �� ���� ��������� "
 "��������.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7029,7 +7179,7 @@ msgid "failed to read mtab"
 msgstr "���������� ���������� ��������� %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "���������� �������� �����.\n"
@@ -7071,72 +7221,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "���������� finger ��������.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: ������������ ����������� ��������"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "������ ������ ������� �� %s\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "���������� �������� �����.\n"
@@ -7225,7 +7415,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: ���� PAM, ����������� ����������: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "������: "
 
@@ -7676,47 +7866,48 @@ msgstr "���������� �������� �����"
 msgid "too many bare linefeeds."
 msgstr "������� ����� ������ ��������� �����.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "���� � ������� �������� ������ �������� � %d ������\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "��������� ���� � �������: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "�� %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "� %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "�������� %s ����������� ��������"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "���� ����� � ������� �� %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "���� ����� � ������� �� %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ���� ����� �� %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ���� ����� � %s, %s"
@@ -7746,7 +7937,7 @@ msgstr "mount: ������ ��������"
 msgid "setuid failed"
 msgstr "setuid() ���������� ��������"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "���������� ����������� ��������\n"
@@ -7791,8 +7982,8 @@ msgstr "%s: ���������� ���������� �������� ��� %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: ���������� �������������� %s: %s (���� ��������� ��� ��� � %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "�������� ��������� �������� ����������� ��������\n"
@@ -7845,24 +8036,21 @@ msgstr "����������� �������� ����: ����������� 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "�������������: cal [-13smjyV] [[�����] ���]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7974,32 +8162,32 @@ msgstr " �������"
 msgid "failed to add line to output"
 msgstr "���������� �������� �����.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "������ ������"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "���������� �������� �����.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: ���������� ��������� %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "���������� �������� �����.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc ���������� ��������"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8010,91 +8198,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "��������� �������:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "���������� finger ��������.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "��� �������� %s!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "���������� �������� �����.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "���������� �������� �����.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "���������� �������� �����.\n"
@@ -8119,12 +8332,12 @@ msgstr "%s: ���������� ����� ������� \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: ����������� ������ %s; ������ �������:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "�������������: %s [ -s ������ | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ ������ ]\n"
@@ -8144,84 +8357,83 @@ msgstr "������ �����: %d\n"
 msgid "connect %s"
 msgstr "nfs �����������"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "����� nfs"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs �����������"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(��������� ����: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "������ ������ ������� �� %s\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "�������� �� ��������� ���������.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: ��� ������������ ��������: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: ��� ������������ ����������: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8359,7 +8571,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: ���������� ������� : %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8377,12 +8589,13 @@ msgstr "%s: ���������� ������� : %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8390,7 +8603,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8413,40 +8626,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "���������� finger ��������.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "���������� ������� %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "�������� %d ���� �� %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "���������� ����������� ��������\n"
@@ -8466,24 +8679,12 @@ msgstr "���������� ���������� ��������� ���������� %s"
 msgid "%s - No such file or directory\n"
 msgstr "�������� inode �� �������� ���������"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "�������������: namei [-mx] �������_��� [�������_��� ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d �������:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8495,19 +8696,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "�������� --date ������� �������\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8517,169 +8717,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: �������������� %s � %s ����������� ��������: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: �������� �������� -l %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "������"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "������ %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "���������� ���������� ��������� %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "���������� ������� %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "������ ������ %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "�������� id"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "�������� id"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: �������� ��������\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "������ ����� ������ %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8687,29 +8885,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8745,43 +8942,44 @@ msgid "%s: write failed"
 msgstr "openpty ���������� ��������\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "�����"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "���������� finger ��������.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8879,63 +9077,63 @@ msgstr "������ ����� ������ %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "���������� ������������� %s � %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: ������������ \"%s\" �� ����������.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: ���������� �������� ���������� �� ���������� %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", �������� %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", ����������� �� ������ %lld"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", ���������� %s (��� %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", �������� %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", ��� ���������� %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: ���������� �������� ���������� �� ���������� %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: ��� ���������� �� �������� /dev/loop#"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: ���������� ����� �� ������ ���������� ���������� �������� �����"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8945,58 +9143,56 @@ msgstr ""
 "    ��� ���� �� ����� �� ����������� �������� �����. (� ���� ������\n"
 "    ���������������� ���� ��� ��������� `modprobe loop.o'.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "�� ������� ������ ��� ���������� ������.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "������ %d ��� �������\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s ������� �� ������, ����������� ������ ��� ������"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "���������� ������������� � ������, ���������� ������.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): ������� ��������\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): ������� ��������\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "��� ������ mount ���� ��������������� ��� ��������� loop. ����������, "
 "��������� �������������.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9004,7 +9200,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "�������������:\n"
 "  %s loop_����������                                        # ��������� "
@@ -9014,48 +9210,45 @@ msgstr ""
 "��������������\n"
 "  %s [ -e ���������� ] [ -o �������� ] loop_���������� ���� # ���������\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ���������� ������� ���������� %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: ���������� ������"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9614,167 +9807,170 @@ msgstr "������ � ������ xstrndup"
 msgid "not enough memory"
 msgstr "�������� ������"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: ����������� ����� ����� � ����� %s\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "���������� ����������� ��������\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() ���������� ��������"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "�������� %s ����������� ��������"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "���"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 "%s: ��������������: %s ����� ������������ ���������� %04o, ������������� "
 "%04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 "%s: ��������������: %s ����� ������������ ���������� %04o, ������������� "
 "%04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: ������������ ���� %s - ������ � � ������� ����.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s �� %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: ���������� ����� ���������� ��� %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "�� �����������������.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "����� ���������� ��������"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10049,7 +10245,7 @@ msgstr "��������� ������ %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10109,19 +10305,13 @@ msgstr "   p   ����� ������� �������� BSD"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "�� ����� %s ����������� ������ ������� ��������\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10132,47 +10322,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "��������� �������:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "���������� finger ��������.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "���������� �������� �����.\n"
@@ -10300,7 +10489,7 @@ msgstr "������ ������ ������� �� %s\n"
 msgid "failed to set pid %d's policy"
 msgstr "������ ������ ������� �� %s\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
@@ -10572,7 +10761,7 @@ msgstr "%s: %ld ��������� �������� �� ��������� � %ld ����-��� �� ���������\n"
 msgid "Can't set signal handler"
 msgstr "���������� ���������� ���������� �������"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday ���������� ��������"
 
@@ -10581,7 +10770,7 @@ msgstr "gettimeofday ���������� ��������"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "���������� ������ CYGETMON �� %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10589,12 +10778,12 @@ msgstr ""
 "%s: %lu ������, %lu/%lu ����; fifo: %lu �����, %lu ����-���, %lu ����, %lu "
 "������\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f ������/���; %f ���, %f ���������� (����/���)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10602,7 +10791,7 @@ msgstr ""
 "%s: %lu ������, %lu ����; fifo: %lu �����, %lu ����-���, %lu ����, %lu "
 "������\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f ������/���; %f ��� (����/���)\n"
@@ -10694,124 +10883,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "�������������: %s [�����] ����������...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: ����������� �������: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "��� �������� %s!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync ���������� ��������"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(��������� ����: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "��� �������?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync ���������� ��������"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10819,43 +10991,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "�������� ������"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "�������� �������� ���������: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "�� ������� ����� --date.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "������������ ���������� ��������� = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty ���������� ��������\n"
@@ -10863,100 +11035,100 @@ msgstr "openpty ���������� ��������\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "��� %s ��������� ��������\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: ���������� ������� %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: �������� ��������\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "�������� ��������� �������� ����������� ��������\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "���������� finger ��������.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "�� ������� ����� --date.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "�� ������� ����� --date.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "����� ���������� ��������"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "�������� inode �� �������� ���������"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "openpty ���������� ��������\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "openpty ���������� ��������\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10965,101 +11137,92 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "���������� finger ��������.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "�� ������� ����� --date.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "�������� inode �� �������� ���������"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "openpty ���������� ��������\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "�������������: %s [�����] ����������...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "���������� finger ��������.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "������� ����. ���. ������ shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "������� ��������� msqid=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "�������� ��������� = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11557,8 +11720,8 @@ msgstr ""
 "������� ����. ���. ������ shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11567,8 +11730,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "�����=%#o\t�����_�������=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "�����=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11601,8 +11764,8 @@ msgstr ""
 "������� ��������� msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\t�����=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11635,8 +11798,8 @@ msgstr ""
 "������ ��������� semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11684,71 +11847,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "�������� id: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "�������� id: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s �� %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "�������� id"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "�������� id: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s �� �������� ������ ������� �����������"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "���������� �������� ������ %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "���������� ����� �� �������� ����������"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "���������� �������� ������ %s"
@@ -11905,48 +12066,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "���������� finger ��������.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "�������� inode �� �������� ���������"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s �������������.\t "
@@ -11982,55 +12138,50 @@ msgstr ""
 "\t -n            ���������� ��������������� ������� ������\n"
 "\t -V            ����� ������ ������ �����\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: ������ ������ %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "���_�������������: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): �������� ������ map\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: ���������� ����� \"_stext\" � %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: ����� profile �� ��������� ���������. �������� ���� map?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "�����"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12039,240 +12190,231 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "���������� finger ��������.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s �� %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: ����������� �������: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "�������� �������� ����-����: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "������������"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "������ ������ ������� �� %s\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "������ ������ ������� �� %s\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: ������ ��������� %d, ����� ��������� %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "�������������: %s [�����] ����������...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "���������� finger ��������.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "gettimeofday ���������� ��������"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "�������� ��������� = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr ""
 "\n"
 "������ �������� �����\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "����� ���������� ��������"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "�������� ��������� = %d\n"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "gettimeofday ���������� ��������"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: �������������� ��� ������� ��������\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: ���������� ������� : %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "������������ %s.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "������������ %s.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s �� lp-����������.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "��������� �� %s@%s �� %s � %s ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "��������� �� %s@%s �� %s � %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(��������� ����: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12323,17 +12465,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr "���������� `getopt --help' ��� ��������� �������������� ����������.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: �������������� ��� ������� ��������\n"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "�������� ������"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "������ ������ ������� �� %s\n"
@@ -12419,173 +12561,171 @@ msgstr "%s ���������� ���������� %d\n"
 msgid "%s using polling\n"
 msgstr "%s ���������� �����\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "�������������: %s ��������� [�������� ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "���������� finger ��������.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "����� ���������� ��������"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: ���������� ��������� %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "������ ����� ������ %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: ���������� ����� ������� \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: ���������� ��������� %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "���������� �������� �����.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "�������� �������� ����-����: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "�������� ������"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "���������� �������� �����.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "�������� ��������: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "������� ����� �������������� ���������"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: ���������� ������� ��� ����������� ����: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ��������� ����������"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: �� ������ ��� ������/������"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: �������� ������������: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "���: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: ������: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: ������������ �����"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12597,69 +12737,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "������������"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "������������"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "����� ���������� ��������"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(��������� ����: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "- ��\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "- ���\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "�������� ��������� = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "�������� id: %s\n"
@@ -12675,52 +12809,46 @@ msgstr ""
 "����������� `%s [�����] %s', ���� �� ������������� ������ ��� ������������.\n"
 "������ �� �������.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "���������� ������� ���� '%s'"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "������ �������, ���� - %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "������ ������� %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: ���������� ����� ���������� ��� %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12729,80 +12857,77 @@ msgstr ""
 "\n"
 "������ �������� %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "������ ��������, ���� - %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty ���������� ��������\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "�� ������� pty\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "�������� %s ����������� ��������"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "������������ ���������� ��������� = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "���������� ������� ���� '%s'"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() ���������� �������� ��� ������ ������� �� %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: ����������� ����� ����� � ����� %s\n"
@@ -12813,111 +12938,108 @@ msgid "Argument error."
 msgstr "%s: ������ ���������, �������������\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "���������� finger ��������.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "���������� ������� �������� �������"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "���������� ������� �������� �������"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "���������� ������� %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "���������� ����������/����� ����� ����������������\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "���������� ������� ���������� %s ��� ������\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "������ klogctl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "������ ������ ����� ������\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "���������� ������� %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: ���������� $TERM �� ����������.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: ����������� ������ %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12945,142 +13067,144 @@ msgstr "�������� ��������� ��������: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "�������������: %s [�����] ����������...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "�������� id"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "�������� �������� ����-����: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: ���������� ������� ��������� ����.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: ���������� ���������� ��������: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "���������� �������� ������ �����"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "����������������� ��������� �� %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: �� ����� �������� %s - ����������� ����������� ����.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "����� ���������� ��������"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(��������� ����: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "�������������: namei [-mx] �������_��� [�������_��� ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: ���������� ����� ��� ������ tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: ���� ���������� �� ������ ���� ���������.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s �� ����� � ������� %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: ��� %s ��������� ��������� �� %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s �� ����� � �������\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: ��� %s ��������� ���������\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s ����� � ������� ����� ������ ����; ������ ����������� � %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "������ ������� ������ ������� �������.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "��������� �� %s@%s (��� %s) �� %s � %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "��������� �� %s@%s �� %s � %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "malloc ���������� ��������"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13259,7 +13383,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13463,7 +13587,7 @@ msgstr ""
 "\n"
 "������ �� ������\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "������ �� ������"
 
@@ -13528,7 +13652,7 @@ msgstr "hexdump: �������� ������ {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: �������� ������ �������������� %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13556,7 +13680,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13564,81 +13688,81 @@ msgstr ""
 "%s: �������������: %s [-�����] [-p ������] [-cefnrs] [+������] [+/������/] "
 "[�����]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: ��� ����� ��������� �������� -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: �������� ����� -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...������������ ������\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...������������ �����\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "��� ���������� �����"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "��� ����������� �����"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: ������ ������ �� ����� %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: ����������� ����� ����� � ����� %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: ����������� ������ � ����� %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: ���������� ������� ��������� ����\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "������ RE: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(����� �����)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "��� ����������� ����� ������"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "���������� ������� "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "��������"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !������� �� ��������� � ������ rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() ���������� ��������, ���������� ��� ��� �������\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(��������� ����: "
 
@@ -13706,8 +13830,8 @@ msgstr "�������������: %s [�����] ����������...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13723,39 +13847,105 @@ msgstr "%s: ���������� ������� : %s\n"
 msgid "no input file specified"
 msgstr "�� ������� ����� --date.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "�������������: %s [�����] ����������...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "�������� ������ terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "����������� escape-������������������ �� ������� ������: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "������ ������� ������ ������� �������.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "�������������:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "������ �������� �����\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "� ��������� �� ������ �������� ��� �������� ��������.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "��������������: ������ %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "��������������: ������� %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "� ������������� � %s\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "�������������: %s [�����] ����������...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "����������: ���-�� ����� /dev/hda ��� /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "�����"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "�������������: %s [�����] ����������...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "�������������: %s [�����] ����������...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "�������������: %s [�����] ����������...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "�������������: %s [�����] ����������...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13902,28 +14092,10 @@ msgstr "������ ������� ������ ������� �������.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [��� --help]:      ����� ����� ���������"
 
-#~ msgid "dangerous options:"
-#~ msgstr "������� �����:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g [��� --show-geometry]: ����� ���������, ���������� �����"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [��� --show-pt-geometry]: ����� ���������, ���������� �� ������� "
-#~ "��������"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [��� --show-extended]: ����� ����� ������ ����������� �������� �� "
-#~ "������\n"
-#~ "                              ��� ��������� ����������� ��� ��� �� �����"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -13985,57 +14157,9 @@ msgstr "������ ������� ������ ������� �������.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [�����] [--] ������_����� ���������\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [�����] -o|--options ������_����� [�����] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              ���������\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            ���������� ������� �����, ������������ � "
-#~ "������ -\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr ""
-#~ "  -h, --help                   ��� ��������� ����������� �� "
-#~ "�������������\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=longopts   ������� ����� ��� �������������\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=���_���������     ���, �� �������� ������� ����� �� �������\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=������_�����   �������� ����� ��� �������������\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  ���������� ������ �� ������� getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           ��� ������� �������� ������\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=����             ��������� ������� ����. � ������� ��� "
-#~ "�����\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   �������� ������ getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr ""
-#~ "  -u, --unqote                 �� ��������� � ������� �������� ������\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                ����� ���������� � ������\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (�������������������) 1.1.4\n"
 
diff --git a/po/sl.po b/po/sl.po
index 9fbd29799..4e65f2215 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -12,8 +12,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre6\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2006-03-05 12:29+0200\n"
 "Last-Translator: Simon Mihevc <simonmihevc@email.si>\n"
 "Language-Team: Slovenian <translation-team-sl@lists.sourceforge.net>\n"
@@ -115,29 +115,29 @@ msgstr "ponovno preberi tabelo razdelkov"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "preberi velikost(v bajtih)"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, fuzzy, c-format
 msgid "%s (%s)\n"
 msgstr "%s: %s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "ni mogo�e odpreti %s"
@@ -218,7 +218,7 @@ msgid "Verifying ... "
 msgstr "Preverjanje..."
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Datoteke ,%s` ni mogo�e odpreti"
@@ -258,15 +258,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -279,7 +279,7 @@ msgstr "%s iz %s\n"
 msgid "cannot stat file %s"
 msgstr "stanja naprave %s ni mogo�e dobiti"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -328,8 +328,8 @@ msgid "stat failed: %s"
 msgstr "(Naslednja datoteka: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty ni uspel\n"
@@ -560,55 +560,55 @@ msgstr "%s neveljaven cramfs - neveljaven odmik datote�nih podatkov\n"
 msgid "compiled without -x support"
 msgstr "%s: prevedeno brez -x argumenta\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Vredu\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Uporaba: %s [-larvsmf] /dev/ime\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s je priklopljen.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Ali res �elite nadaljevati"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "preverjanje prekinjeno.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "�tevilo obmo�ja < PRVOOBMO�JE v datoteki `%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "�tevilo obmo�ja >= OBMO�JA v datoteki `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Odstrani blok"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Napaka pri branju: iskanje do bloka v datoteki ni mo�no '%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Napaka pri branju: po�kodovan blok v datoteki ,%s`\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -617,297 +617,297 @@ msgstr ""
 "Notranja napaka: poskus pisanja v po�kodovan blok\n"
 "Zahteva po pisanju je ignorirana.\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "iskanje ni uspelo v write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Napaka pri pisanju: po�kodovan blok v datoteki '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "neuspe�no iskanje v write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "superbloka ni mo�no zapisati"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "seznama inodov ni mo�no zapisati"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "seznama obmo�ij ni mo�no zapisati"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Zapis inodov ni mo�en"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "dodelitev medpomnilnika za sezname ni uspela"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "branje superbloka ni mo�no"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "po�kodovan tip datoteke v superbloku"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Samo 1k veliki bloki/podro�ja so podprti"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "po�kodovano s_imap_blocks polje v superbloku"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "po�kodovan s_zmap_blocks polje v superbloku"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Dodelitev medpomnilnika za seznam inodov ni mo�na"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "Dodelitev medpomnilnika za seznam inodov ni mo�na"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Dodelitev medpomnilnika za inode ni mo�na"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Dodelitev medpomnilnika za �tevilo inodov ni mo�na"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Dodelitev medpomnilnika za �tevilo podro�ij ni mo�na"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Branje seznama inodov ni mo�no"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Branje seznama podro�ij ni mo�no"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Branje inodov ni mo�no"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Opozorilo: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodov\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blokov\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Prvo podatkovno podro�je=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Velikost podro�ja=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Najve�ja velikost=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Stanje dat. sistema=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "dol�ina datoteke=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inod %d ozna�en kot prost, vendar je �e zaseden za datoteko ,%s`\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Ozna�i, da je v rabi"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Ta datoteka `%s' je v stanju %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Opozorilo: �tevilo inodov preveliko.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "korenski inod ni imenik"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok je �e bil v rabi. Sedaj je v datoteki `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Po�isti"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Blok %d v datoteki ,%s` je ozna�en kot prost."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Popravi"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Direktory '%s' vsebuje po�kodovan �tevilko inoda za datoteko '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr "Odstrani"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: po�kodovan imenik: '.' ni na prvem mestu\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: po�kodovan imenik: '..' ni na drugem mestu\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "notranja napaka"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: po�kodovan imenik: velikost < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "iskanje v bad_zone ni uspelo"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "stanje %d inoda ni po�i��eno"
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inod %d ni v rabu, ozna�en kot v rabi v sliki."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inod %d v rabi, ozna�en kot ni v rabi v sliki."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Nastavi"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inod %d (stanje = %07o), i_nlinks=%d, counted=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks nastavi na count "
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr ""
 "Podro�je %d: ozna�eno kot v rabi, vendar ga nobena datoteka ne uporablja."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Odzna�i"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Podro�je %d: v rabi, counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Podro�je %d: ni v rabi, counted=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "slaba velikost inoda"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "slaba velikost v2 inoda"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "za interaktivna opravila je potreben terminal"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "'%s' ni mogo�e odpreti"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s je �ist, preverjanje ni potrebno.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Prisilni pregled datote�nega sistema na %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Datote�ni sistem na %s ni �ist, potrebuje pregled.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -916,12 +916,12 @@ msgstr ""
 "\n"
 "%6ld inodov porabljenih (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld podro�ij porabljenih (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -944,7 +944,7 @@ msgstr ""
 "------\n"
 "%6d datotek\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1068,7 +1068,7 @@ msgstr "preve� inodov - najve� 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "ni zadosti prostora, najmanj %lu blokov"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Naprava %s\n"
@@ -1243,10 +1243,8 @@ msgstr "%6.2f%% (%+d bajtov)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Napaka pri zapiranju datoteke\n"
+msgid "cannot close file %s"
+msgstr "Datoteke ,%s` ni mogo�e odpreti"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1354,88 +1352,98 @@ msgstr ""
 "pomeni,\n"
 "da se bodo pojavile napake v datotekah naprav.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Uporaba: %s [-c | -l ime dat.] [-nXX] [-iXX] /dev/ime [bloki]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s je priklopljen; dat. sistema zato ne bo narejen!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "iskanje do zagonskega bloka ni uspelo v write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "zagonskega sektorja ni mogo�e po�istiti"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "iskanje ni uspelo v write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "superbloka ni mo�no zapisati"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "zapis seznama inodov ni uspel"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "zapis seznama podro�ij ni uspel"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "zapis inodov ni uspel"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "iskanje ni uspelo v write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "pisanje ni uspelo v write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "preve� po�kodovanih blokov"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "premalo nepo�kodovanih blokov"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "dodelitev medpomnilnika za sezname ni uspela"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "dodelitev medpomnilnika za sezname ni uspela"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "dodelitev medpomnilnika za inode ni uspela"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodov\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blokov\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1444,98 +1452,98 @@ msgstr ""
 "Najve�ja velikost=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "iskanje med testiranjem blokov ni uspelo"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Nenavadne vrednosti v do_check: verjetno programska napaka\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "iskanje v check_blocks ni uspelo"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 "slabi bloki pred podatkovnim obmo�jem: datote�nega sistema ne morem narediti"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d po�kodovanih blokov\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "en po�kodovan blok\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "ne morem odpreti datoteke s po�kodovanimi bloki"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "Diskovnega pogona ni mogo�e prebrati"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "slaba velikost inoda"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "napaka v strtol: �tevilo blokov ni podano"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty ni uspel\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: naprava je zaposlena"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "na '%s' ne bo poskusa narediti datote�ni sistem"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "�tevilo sektorjev"
@@ -1873,7 +1881,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "iskanje ni uspelo v write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2218,7 +2226,7 @@ msgid "   Logical"
 msgstr "   Logi�en"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Neznano"
 
@@ -2886,12 +2894,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Ukaz BSD oznaka diska (m za pomo�): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Prvi %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Zadnji %s ali +size ali +sizeM ali +sizeK"
@@ -3038,7 +3046,7 @@ msgid "tracks/cylinder"
 msgstr "sledi/stezo"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "steze"
 
@@ -3105,12 +3113,12 @@ msgstr "Najve�je mo�no �tevilo razdelkov je bilo ustvarjeno\n"
 msgid "This partition already exists.\n"
 msgstr "Ta razdelek �e obstaja.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Opozorilo: preve� particij (%d, najve� pa je %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3314,7 +3322,7 @@ msgstr "Nastaviti morate"
 msgid "heads"
 msgstr "glave"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektorji"
 
@@ -3743,7 +3751,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Zagon    Za�etek       Konec     Bloki    Id  Sistem\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Naprava"
 
@@ -3827,7 +3835,7 @@ msgstr "Vsota dodeljenih sektorjev %d je ve�ja od najve�je %lld\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld nedodeljenih sektorjev\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Razdelek %d je �e dolo�en. Zbri�ite ga preden ga ponovno dodate.\n"
@@ -3983,37 +3991,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Sinhroniziram diske.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Razdelek %d nima podatkovnega obmo�ja\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Nov za�etek podatkov"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Strokovni ukaz (m za pomo�): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "�tevilo stez"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "�tevilo glav"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "�tevilo sektorjev"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Opozorilo: odmik sektorja bo nastavljen tako, da bo zdru�ljiv z DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4022,33 +4030,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s ne vsebuje veljavne tabele razdelkov\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s ne morem odpreti\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s ne morem odpreti\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: neznan ukaz\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "To jedro najde velikost sektorja samostojno - -b izbire ni upo�tevana\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4057,18 +4065,18 @@ msgstr ""
 "Opozorilo: izbira -b (nastavi velikost sektorja) se naj uporablja s podano "
 "napravo\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "Na %s je bila zaznana oznaka diska tipa OSF/1, vstopa v na�in ozna�evanja "
 "diska.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Ukaz (m za pomo�): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4077,16 +4085,16 @@ msgstr ""
 "\n"
 "Trenutna zagonska datoteka je: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Prosimo vpi�ite ime nove zagonske datoteke: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Zagonska datoteka ni bila spremenjena\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4410,9 +4418,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tIzbrali ste nenavadno ime zagonske datoteke.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "�al lahko spremenite Oznako nepraznih razdelkov.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "�al lahko samo sistemski skrbnik spreminj sistemsko uro.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4427,7 +4435,7 @@ msgstr ""
 "sash in fx z njega. Samo \"SGI obseg\" celoten del diska lahko\n"
 "kr�i to. Vtipkajte DA, �e resni�no �elite ozna�iti to particijo druga�e.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "DA\n"
 
@@ -4628,7 +4636,7 @@ msgstr "Neporabljen prostor - sektorji 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Neporabljen prostor - sektorji %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4637,7 +4645,7 @@ msgstr ""
 "Drugi razdelki �e prekrivajo ves disk.\n"
 "Izbri�ite/pomanj�ajte nekatere preden ponovno poskusite.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4646,12 +4654,12 @@ msgstr ""
 "Priporo�ljivo je, da enajsti razdelek\n"
 "prekriva celoten disk in je tipa `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d je �e dodeljen\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4662,7 +4670,7 @@ msgstr ""
 "%d %s prekriva nekatere druge razdelke. Va� vnos je bil spremenjen\n"
 "na %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4671,7 +4679,7 @@ msgstr ""
 "�e �elite ohraniti zdru�ljivost s SunOS/Solaris, potem pustite\n"
 "ta razdelek kot Celoten disk (5), z za�etkom na 0 in %u sektorji\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4685,7 +4693,7 @@ msgstr ""
 "razdelkov in zagonski blok. Vnesite DA, �e res �elite\n"
 "da se ta razdelek ozna�i kot 82 (Linux izmenjalni): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4705,7 +4713,7 @@ msgstr ""
 "Enote = %s od %d * 512 bajtov\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4718,28 +4726,28 @@ msgstr ""
 "Enote =%s od %d * 512 bajtov\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Zastava Za�etek    Konec   Bloki    Id  Sistem\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "�tevilo drugih stez"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Dodatni sektorji na stezo"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Faktor prepletenosti"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Hitrost vrtenja (obrati/min)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "�tevilo fizi�nih stez"
 
@@ -5199,7 +5207,7 @@ msgstr "Disk %s: geometrije ni mogo�e najti\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: velikosti ni mogo�e najti\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5210,22 +5218,22 @@ msgstr ""
 "celotnemu disku. Uporaba fdisk-a na njem je verjetno \n"
 "brez smisla. [uporabite --force izbiro �e to res �elite]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Opozorilo: HDIO_GETGEO pravi da je %lu glav\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Opozorilo: HDIO_GETGEO pravi, da je %lu sektorjev\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Opozorilo: BLKGETSIZE/HDIO_GETGEO pravi, da je %lu stez\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5235,7 +5243,7 @@ msgstr ""
 "To bo povzro�ilo te�ave z vso programsko opremo, ki uporablja C/G/S "
 "naslavljanje.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5244,13 +5252,13 @@ msgstr ""
 "\n"
 "Disk %s: %lu stez, %lu glav, %lu sektorjev/stezo\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "%s od razdelka %s ima nemogo�o vrednost glave: %lu (mora biti 0-%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5258,14 +5266,14 @@ msgid ""
 msgstr ""
 "%s od razdelka %s ima nemogo�o vrednost sektorja: %lu (mora biti 1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
 "%lu)\n"
 msgstr "%s od razdelka %s ima nemogo�o vrednost steze: %lu (mora biti 0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5274,12 +5282,12 @@ msgstr ""
 "Id  Ime\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Ponovno berem tabelo razdelkov ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5289,26 +5297,26 @@ msgstr ""
 "Ukaz ponovnega branja tabele razdelkov ni uspel\n"
 "Ponovno za�enite va� sistem zdaj pred uporabo mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Napaka pri zapiranju %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: tak razdelek ne obstaja\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "nerazpoznavna oblika - uporabljam sektorje\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "nepodprta oblika - uporabljam %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5317,12 +5325,12 @@ msgstr ""
 "Enote = steze po %lu bajtov, bloki po 1024 bajtov, �tejem od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr " Naprava Zagon Za�etek Konec  #steze    #bloki    Id  Sistem\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5331,12 +5339,12 @@ msgstr ""
 "Enote = sektorji po 512 bajtov, �tejem od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr " Naprava Zagon   Za�etek     Konec  #sktrji   Id  Sistem\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5345,12 +5353,12 @@ msgstr ""
 "Enote = bloki po 1024 bajtov, �tejem od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr " Naprava Zagon  Za�etek     Konec   #bloki    Id  Sistem\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5359,33 +5367,33 @@ msgstr ""
 "Enote = MiB iz 1048576 bajtov, bloki po 1024 bajtov, �teje se od %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "Naprava Zagon Za�etek Konec   MiB    #bloki    Id  Sistem\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tza�etek: (stz,g,skt) pri�akovano (%ld,%ld,%ld), najdeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tkonec: (stz,g,skt) pri�akovano (%ld,%ld,%ld), najdeno (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "razdelek se kon�a na stezi %ld za koncem diska\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Noben razdelek ni bil najden\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5396,51 +5404,41 @@ msgstr ""
 " narejena za stz/g/skt=*/%ld%ld (namesto %ld/%ld/%ld).\n"
 "Za ta spisek se privzema to geometrijo.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "nobena tabela razdelkov ni na voljo.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "zanimivo, samo %d razdelkov je dolo�enih.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Opozorilo: razdelek %s ima velikost 0 ampak ni ozna�en kot Prazen\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Opozorilo: razdelek %s ima velikost 0 in je ozna�en kot zagonski\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Opozorilo: razdelek %s ima velikost 0 in neni�elni za�etek\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Opozorilo: razdelek %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "ni vsebovan v razdelku %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Opozorilo: razdelki %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "in %s se prekrivata\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Opozorilo: razdelek %d je prazen\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5449,17 +5447,17 @@ msgstr ""
 "Opozorilo: razdelek %s vsebuje del tabele razdelkov (sektor %lu)\n"
 "in bo uni�en, ko se napolni\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Opozorilo: razdelek %s se za�ne na sektorju 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Opozorilo: razdelek %s poteka za koncem diska\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5467,17 +5465,17 @@ msgstr ""
 "Med primarnimi razdelki se lahko raz�iri samo eden\n"
 " (�eprav to ni problem pri Linux-u)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Opozorilo: razdelek %s se ne za�ne na meji s stezo\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Opozorilo: razdelek %s se ne kon�a na meji s stezo\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5485,7 +5483,7 @@ msgstr ""
 "Opozorilo: ve� kot en primarni razdelek je ozna�en kot zagonski \n"
 "To ni problem za LILO, samo DOS MBR se ne more zagnati s tega diska.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5493,7 +5491,7 @@ msgstr ""
 "Opozorilo: ponavadi se lahko zaganja s primarnih razdelkov, samo\n"
 "LILO ne upo�teva zastavice `bootable'.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5501,11 +5499,11 @@ msgstr ""
 "Opozorilo: noben primarni razdelek ni ozna�en kot zagonski\n"
 "To ni problem za LILO, samo DOS MBR se ne more zagnati s tega diska.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "za�etek"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5513,23 +5511,23 @@ msgstr ""
 "razdelek %s: za�etek: (stz,g,skt) pri�akovano (%ld,%ld,%ld), najdeno (%ld,"
 "%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "konec"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "razdelek %s: konec: (stz,g,skt) pri�akovano (%ld,%ld,%ld) najdeno (%ld,%ld,"
 "%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "razdelek %s se kon�a na stezi %ld, za koncem diska\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5538,7 +5536,7 @@ msgstr ""
 "Opozorilo: za�etek raz�irjenega razdelka je bil premaknjen\n"
 "od %ld na %ld (Samo za izpisovanje, ne spreminjajte vsebine.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5546,131 +5544,131 @@ msgstr ""
 "Opozorilo: raz�irjen razdelek se ne za�ne na meji s stezo.\n"
 "DOS in Linux bosta tolma�ila vsebino razli�no.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "preve� razdelkov - po �t. %d ne bodo upo�tevani\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "drevo razdelkov?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "zaznan je Upravljalnik diska - upravljanje z njim ni podprto\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6 podpis najden - kon�ujem\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "zanimivo..., raz�irjen razdelek velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "zanimivo..., BSD razdelek velikosti 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, fuzzy, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: neprepoznan tip tabele razdelkov"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n zastavica je bil podana: Brez sprememb\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Neuspe�no shranjevanje starih sektorjev - prekinjam\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "dolga ali nepopolna vnosna vrstica - kon�ujem\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "vhodna napaka: `=' pri�akovano po polju %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "vhodna napaka: nepri�akovan znak %c po polju %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "neprepoznan vhod: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "prevelika �tevilka\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "�tevilki sledijo �udni podatki\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "za opisnik razdelka ni prostora\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "ustvarjanje raz�irjenega razdelka okoli obstoje�ega ni uspelo\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "preve� vhodnih polj\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Ni ve� prostora\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Nepravilen tip\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Opozorilo: podana velikost (%lu) presega najve�jo dovoljeno (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Opozorilo: prazen razdelek\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Opozorilo: po�kodovan za�etek razdelka (najprej %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "neprepoznana zagonska zastavica - izverite - ali *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "delna stz,g,skt specifikacija?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Raz�irjen razdelek na nepri�akovanem mestu\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "slab vnos\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "preve� razdelkov\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5680,99 +5678,180 @@ msgstr ""
 "<start> <size> <type> [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Ponavadi je potrebno zapisati samo <start> in <size> (v�asih tudi <type>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Uporaba: %s [izbire] naprava ...\n"
+msgstr "Uporaba:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "naprava: npr. /dev/hda ali /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d razdelkov:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "nevarne izbire:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [ali --show-pt-geometry]: izpi�i uganjeno gometrijo iz tabele "
+"razdelkov"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [ali --show-extended]: izpi�i tudi raz�irjene razdelke ali\n"
+"                              pri�akuj opisnike na vhodu"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Uporaba:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s naprava\t\t izpi�i dejavne razdelke na napravi\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s naprava �t1 �t2 ... aktiviraj razdelek n1 ..., deaktiviraj ostale\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s - Naprava\t aktivira razdelek n, deaktivira ostale\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5781,62 +5860,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Uporabite --force izbiro da obidete vsa preverjanja.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "ni ukaza?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, fuzzy, c-format
 msgid "total: %llu blocks\n"
 msgstr "skupno: %llu blokov\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "uporaba: sfdisk --print-id naprava �t. razdelka\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "uporaba: sfdisk --change-id naprava �t. razdelka Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "uporaba: sfdisk --id naprava �t. razdelka [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "navedete lahko samo eno napravo (razen z -l ali -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s ni mogo�e odpreti za branje in pisanje\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s ni mogo�e odpreti za branje\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld stez, %ld glav, %ld sektorjev/sled\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, fuzzy, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Velikosti %s ni mogo�e ugotoviti\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "slab dejavni bajt: 0x%x namesto 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5844,7 +5923,7 @@ msgstr ""
 "Opravljeno\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5853,35 +5932,35 @@ msgstr ""
 "Imate %d dejavnih primarnih razdelkov. Za LILO to ni te�ava,\n"
 "ampak DOS MBR se bo nalo�il samo z diskov, ki imajo 1 dejaven razdelek.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "razdelek %s ima id %x in ni skrit\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Slab Id %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Ta disk je trenutno v rabi.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Usodna napaka: %s ni mogo�e najti\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Opozorilo: %s ni blokovna naprava\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Preverjam, da nih�e ne uporablja tega diska ...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5894,30 +5973,30 @@ msgstr ""
 "disku.\n"
 "Uporabite --no-reread zastavico da izklju�ite to preverjanje.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Uporabite --force izbiro da obidete vsa preverjanja.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "VREDU\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Staro stanje:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Razdelek %d ne obstaja in ne more biti spremenjen\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Novo stanje:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5925,21 +6004,21 @@ msgstr ""
 "Te razdelki mi ne ustrezajo - ni sprememb.\n"
 "(�e res �elite to, uporabite izbiro --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "To mi ne ustreza - verjetno bi morali odgovoriti Ne\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Ali ste zadovoljni s tem? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Ali �elite zapisati to na disk? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5948,16 +6027,16 @@ msgstr ""
 "\n"
 "sfdisk: prezgoden konec vnosa\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Kon�ujem - brez sprememb\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Prosim, da odgovorizo z y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5966,7 +6045,7 @@ msgstr ""
 "Tabela razdelkov je uspe�no zapisana\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5999,101 +6078,103 @@ msgstr "Sinhroniziram diske.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s je uspelo.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: %s ni mogo�e odpreti: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: neuspe�no iskanje"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: napaka %d pri raz�irjanju! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s ni lp naprava.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Prisilni pregled datote�nega sistema na %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6101,58 +6182,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s ni lp naprava.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Ni mogo�e odpreti %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s je odklopljen\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Odklapljam preostale datote�ne sisteme..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Odklapljam preostale datote�ne sisteme..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: neznan argument: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6169,33 +6250,77 @@ msgstr "dolga prazna izbira po -l ali --long izbira"
 msgid "unknown shell after -s or --shell argument"
 msgstr "neznana lupina po -s ali -shell izbira"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [izbire] -o|--izbire optstring [izbire] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a. --alternative            Dovoli dolge izbire, ki se za�nejo z enim -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h  --help                   Manj�a navodila\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l  --longoptions=dolgeizbire   Dolge izbire za prepoznavo\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=imeprograma       Ime na katerega se naslavljajo napake\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=nizizbir       Kratke izbire za prepoznavo\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  Onemogo�i getopt(3) poro�anje napak\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Brez normalnega izhoda\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s,  --shell=lupina          Nastavi lupinsko konvencijo citiranja\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T. --test                   Test za razli�ico getopt(1)\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 Ne citiraj izhoda\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Izpi�i informacije o razli�ici\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "manjka izbira nizizbir "
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "notranja napaka, sporo�ite avtorju."
 
@@ -6648,91 +6773,109 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Vrednosti epoch ni bilo mo�no nastaviti.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d razdelkov:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                povej hwclocku tip alpha, ki ga imap (glej hwclock(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "Sistemske ure se ne da nastaviti.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s ne sprejema argumentov brez izbir. Podali ste: %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6741,7 +6884,7 @@ msgstr ""
 "Podali ste ve� funkcij.\n"
 "Izvedete lahko samo eno funkcijo naenkrat.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6749,7 +6892,7 @@ msgid ""
 msgstr ""
 "%s: --utc in --localtime izbiri se medsebojno izklju�ujeta. Podali ste obe.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6758,7 +6901,7 @@ msgstr ""
 "%s: --adjust in --noadjfile izbiri se medsebojno izklju�ujeta. Podali ste "
 "obe.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6767,39 +6910,39 @@ msgstr ""
 "%s: --adjust in --noadjfile izbiri se medsebojno izklju�ujeta. Podali ste "
 "obe.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: --noadjfile morate podati skupaj z --utc ali --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Ni uporabnega nastavitvenega �asa. Ura ne bo nastavljena.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "�al lahko samo sistemski skrbnik spreminja strojno uro.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "�al lahko samo sistemski skrbnik spreminj sistemsko uro.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr ""
 "�al lahko samo sistemski skrbnik spreminja razdobje strojne ure v jedru.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "Do strojne ure ni mogo�e dostopati po znanih metodah.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -6979,7 +7122,7 @@ msgid "failed to read mtab"
 msgstr "stanja %s ni mogo�e dobiti"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
@@ -7021,72 +7164,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: priklop ni uspel"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
@@ -7175,7 +7358,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: PAM ni uspel, prekinjam: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Geslo: "
 
@@ -7624,47 +7807,48 @@ msgstr "PREKOMERNI pomiki v novo vrsto"
 msgid "too many bare linefeeds."
 msgstr "preve� pomikov v novo vrsto\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Prijava je potekla po %d sekundah.\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Zadnja prijava: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "z ra�unalnika %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "z linije %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "Odpiranje %s ni uspelo"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "NEUSPE�NA PRIJAVA Z %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "NEUSPE�NA PRIJAVA NA %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d NEUSPE�NIH PRIJAV Z %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d NEUSPE�NIH PRIJAV NA %s, %s"
@@ -7694,7 +7878,7 @@ msgstr "mount: dostop zavrnjen"
 msgid "setuid failed"
 msgstr "klic setuid() ni uspel"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "zagon ni uspel\n"
@@ -7739,8 +7923,8 @@ msgstr "%s: Ni mogo�e nastaviti uporabni�ke zveze za %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: ni mogo�e odkleniti %s: %s (va�e spremembe so �e vedno v %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "vejitev ni uspela\n"
@@ -7793,24 +7977,21 @@ msgstr "neveljavna vrednost leta: uporabite 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "uporaba: cal [-13smjyV] [[mesec] leto]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7922,32 +8103,32 @@ msgstr "Odstrani"
 msgid "failed to add line to output"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "napaka pri iskanju"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s %s ni mogo�e brati.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc ni uspel"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7958,91 +8139,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Razpolo�ljivi ukazi:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Imenik %s ne obstaja!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
@@ -8067,12 +8273,12 @@ msgstr "%s: procesa ni mogo�e najti \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: neznan signal %s; veljavni signali:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "uporaba: %s [ -s signal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "\t%s -l [signal ]\n"
@@ -8092,84 +8298,83 @@ msgstr "Velikost bloka: %d\n"
 msgid "connect %s"
 msgstr "nfs povezava"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs kanal"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs povezava"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Naslednja datoteka: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Vrednost izven dosega.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: neznano ime poslopja[facility]: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: neznano prednostno ime: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8307,7 +8512,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8325,12 +8530,13 @@ msgstr "%s: odpiranje ni uspelo: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8338,7 +8544,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8361,40 +8567,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Ni mogo�e odpreti %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Dobljenih %d bajtov od %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "zagon ni uspel\n"
@@ -8414,24 +8620,12 @@ msgstr "stanja naprave %s ni mogo�e dobiti"
 msgid "%s - No such file or directory\n"
 msgstr "korenski inod ni imenik"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "uporaba: namei [-mx] imenik [imenik ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d razdelkov:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8443,19 +8637,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "Izbira --date je predolga.\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8465,169 +8658,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: preimenovanje %s na %s ni uspelo: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: slab argument -l: %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Zapi�i"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "beri %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "stanja %s ni mogo�e dobiti"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "%s ni mogo�e odpreti: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s ni mogo�e odpreti: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Napaka pri branju %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "neveljaven id"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "neveljaven id"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: slaba vrednost\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8635,29 +8826,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8693,43 +8883,44 @@ msgid "%s: write failed"
 msgstr "openpty ni uspel\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "bajtov"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8822,63 +9013,63 @@ msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "ni mogo�e preimenovati %s v %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: uporabnik \"%s\" ne obstja.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: informacij o napravi %s ni mogo�e dobiti: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", odmik %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", omejitev_velikosti %lld"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", �ifriranje %s (tip %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", odmik %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", �ifrirni tip %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: informacij o napravi %s ni mogo�e dobiti: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: ni mogo�e odpreti naprave %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: za vpogled v /dev/loop# ni dovoljenja"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, fuzzy, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: iskanje proste loop naprave ni bilo uspe�no\n"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8888,58 +9079,56 @@ msgstr ""
 "\tte vrste. (�e je to res, ponovno prevedi jedro ali si pomagaj z `modprobe "
 "loop'.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Pri pove�evanju medpomnilnika je zmanjkalo pomnilnika.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d je �e dodeljen\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s je za��itena pred pisanjem, priklapljam samo za branje"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "V pomnilnik ni mogo�e zakleniti, kon�ujem.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): uspeh\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): uspeh\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: naprave %s ni mogo�e zbrisati: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Program mount je bil preveden brez podpore za loop. Poskusite ponovno "
 "prevesti mount.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8947,7 +9136,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "uporaba:\n"
 "  %s loop_naprava\t\t\t\t\t# dobi informacije\n"
@@ -8955,48 +9144,45 @@ msgstr ""
 "  %s -f\t\t\t\t\t\t# najdi neuporabljene\n"
 "  %s [-e �ifriranje] [-o odmik] {-f|loop_naprava} dat. # nastavitev\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: ni mogo�e odpreti naprave %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: naprava je zaposlena"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9555,163 +9741,166 @@ msgstr "hro�� v klicu xstrndup"
 msgid "not enough memory"
 msgstr "premalo pomnilnika"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Nepri�akovan konec datoteke v %s\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "zagon ni uspel\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "klic setuid() ni uspel"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Odpiranje %s ni uspelo"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Ime"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: opozorilo: %s ima nevarna dovoljenja %04o, svetujem %04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: opozorilo: %s ima nevarna dovoljenja %04o, svetujem %04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: dat. %s ne bo upo�tevana zaradi lukenj.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s na %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: za %s ni mogo�e najti naprave\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "Niste sistemski skrbnik.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9985,7 +10174,7 @@ msgstr "Izbran razdelek %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10045,19 +10234,13 @@ msgstr "   p   izpi�i BSD-jevo tabelo razdelkov"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Disk %s ne vsebuje veljavne tabele razdelkov\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10068,47 +10251,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Razpolo�ljivi ukazi:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
@@ -10236,7 +10418,7 @@ msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 msgid "failed to set pid %d's policy"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "klic ioctl() ni uspel prebrati �asa iz %s"
@@ -10508,7 +10690,7 @@ msgstr "%s: privzeti prag: %ld, in privzeti odmor: %ld\n"
 msgid "Can't set signal handler"
 msgstr "Signalnega upravljalnika ni mogo�e nastaviti"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "klic gettimeofday ni uspel"
 
@@ -10517,7 +10699,7 @@ msgstr "klic gettimeofday ni uspel"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Signala CYGETMON ni mogo�e izdati na %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10525,12 +10707,12 @@ msgstr ""
 "%s: %lu �tevil, %lu/%lu znakov; fifo: %lu prag, %lu odmor, %lu najve�, %lu "
 "trenutna\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f �t./sek; %f sprejeto, %f poslano (znak/sek)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10538,7 +10720,7 @@ msgstr ""
 "%s: %lu �t., %lu znakov, fifo: %lu prag, %lu odmor, %lu najve�, %lu "
 "trenutna\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f �t./sek; %f sprejetih (znak/sek)\n"
@@ -10630,124 +10812,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Uporaba: %s [izbire] naprava ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Neznan ukaz: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Imenik %s ne obstaja!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync ni uspel"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Naslednja datoteka: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "ni ukaza?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync ni uspel"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10755,43 +10920,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Preve� argumentov.\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Neveljavna vrednost nastavljanja: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "Izbira --date ni bila podana.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "naj. �t. odsekov = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty ni uspel\n"
@@ -10799,100 +10964,100 @@ msgstr "openpty ni uspel\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s zahteva argument\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: %s ni mogo�e odpreti: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: slaba vrednost\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "vejitev ni uspela\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "Izbira --date ni bila podana.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "Izbira --date ni bila podana.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "korenski inod ni imenik"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "openpty ni uspel\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "openpty ni uspel\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10901,101 +11066,92 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "klic ioctl() ni uspel prebrati �asa iz %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "Izbira --date ni bila podana.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "korenski inod ni imenik"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "openpty ni uspel\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Uporaba: %s [izbire] naprava ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "Finger informacija spremenjena.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Segment deljenega pomnilnika shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "msqid sporo�ilne vrste = %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "dodeljeni semaforji = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11487,8 +11643,8 @@ msgstr ""
 "Segment deljenega pomnilnika shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11497,8 +11653,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "na�in=%#o\tdostop_dovoljenja=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bajti=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11531,8 +11687,8 @@ msgstr ""
 "msqid sporo�ilne vrste = %d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11565,8 +11721,8 @@ msgstr ""
 "semid Polj semaforjev=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11614,71 +11770,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s iz %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "neveljaven id"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "neveljavni id: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s ni posebna blo�na naprava"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "ni mogo�e dobiti velikosti %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Iskanje na disku ni mogo�e"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "ni mogo�e dobiti velikosti %s"
@@ -11835,48 +11989,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "korenski inod ni imenik"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s je priklopljen.\t "
@@ -11912,55 +12061,50 @@ msgstr ""
 "\t -n           onemogo�i samozaznavo bajtnega reda\n"
 "\t -V           izpi�i razli�ico in izhod\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: napaka pri pisanju na %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Vzor�ni_korak: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): napa�na preslikovalna(map) vrstica\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: \"_stext\" ni mogo�e najti v %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profil naslova je izven dometa. Napa�na preslik.(map) dat.?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "skupno"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11969,240 +12113,231 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s iz %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Neznan ukaz: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "nepravilna vrednost za prekora�itev �asa: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "uporabnik"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: stara prioriteta %d, nova prioriteta %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Uporaba: %s [izbire] naprava ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "klic gettimeofday ni uspel"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "dodeljeni semaforji = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr ""
 "\n"
 "Napaka pri zapiranju datoteke\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "dodeljeni semaforji = %d\n"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "klic gettimeofday ni uspel"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: neprepoznan tip tabele razdelkov"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: odpiranje ni uspelo: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Uporabljam %s.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Uporabljam %s.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s ni lp naprava.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Sporo�ilo iz %s@%s na %s pri %s ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Sporo�ilo iz %s@%s na %s pri %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "klic ioctl() ni uspel prebrati �asa iz %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Naslednja datoteka: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12253,17 +12388,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr "Poskusite `getopt --help' za ve� informacij.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: neprepoznan tip tabele razdelkov"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "Preve� argumentov.\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "Neuspe�no zapisovanje razdelka na %s\n"
@@ -12348,173 +12483,171 @@ msgstr "%s uporablja IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s uporablja glasovanje\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "uporaba: %s program [izbira ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: ne more izvesti %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "Napaka pri spreminjanju na�ina %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: procesa ni mogo�e najti \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: ne more izvesti %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "nepravilna vrednost za prekora�itev �asa: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Preve� argumentov.\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "Za medpomnilnik ni mogo�e dodeliti pomnilnika.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "nepravilna hitrost: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "preve� razli�nih hitrosti"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: ni mogo�e odpreti kot standardni vhod: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ni znakovna naprava"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: ni odprto za branje/pisanje"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: napaka pri prevari: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "vrsta: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: beri: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: vhod je preplavljen"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12526,69 +12659,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "uporabnik"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "uporabniki"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Naslednja datoteka: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "je y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "je n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "dodeljeni semaforji = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "neveljavni id: %s\n"
@@ -12604,52 +12731,46 @@ msgstr ""
 "Uporabite `%s [izbire] %s' �e jo �elite uporabiti.\n"
 "Skript ni bil izvr�en.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "Datoteke ,%s` ni mogo�e odpreti"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Script se je za�el, dat. je %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Script se je za�el na %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: za %s ni mogo�e najti naprave\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12658,80 +12779,77 @@ msgstr ""
 "\n"
 "Script kon�an na %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Script kon�an, dat. je %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty ni uspel\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Zmanjkalo pty-jev\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "Odpiranje %s ni uspelo"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "klic ioctl() ni uspel prebrati �asa iz %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "naj. �t. odsekov = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "Datoteke ,%s` ni mogo�e odpreti"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "klic ioctl() ni uspel prebrati �asa iz %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: Nepri�akovan konec datoteke v %s\n"
@@ -12742,111 +12860,108 @@ msgid "Argument error."
 msgstr "%s: Napake pri izbiri, uporabi\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "Finger informacija spremenjena.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "vejitev ni mogo�a"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "vejitev ni mogo�a"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "%s ne morem odpreti\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "ni mogo�e nastaviti powersave na�ina\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "naprave %s ni mogo�e odpreti za branje\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl napaka: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Napaka pri branju zaslonskega izpisa\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Ni mogo�e odpreti %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM ni dolo�en.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: neznan signal %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12874,142 +12989,144 @@ msgstr "vejitev: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Uporaba: %s [izbire] naprava ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "neveljaven id"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "nepravilna vrednost za prekora�itev �asa: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: za�asne datoteke ni mogo�e odpreti.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: hitrosti ni mogo�e nastaviti: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Velikosti diskovne steze ni mogo�e prebrati"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Prejeto sporo�ilo od %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: %s ne bo prebran - uporabi stdin.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "iskanje je bilo neuspe�no"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Naslednja datoteka: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "uporaba: namei [-mx] imenik [imenik ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: imena va�ega tty ni mogo�e najti\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: dovoljenje za pisanje imate izklopljeno.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s ni prijavljen na %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s ima onemogo�ena sporo�ila na %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s se ni prijavljen\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s ima onemogo�ena sporo�ila\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s se je prijavil ve� kot enkrat; pi�em v %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Vhodna vrstica je predolga.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Sporo�ilo iz %s@%s (kot %s) na %s pri %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Sporo�ilo iz %s@%s na %s pri %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "malloc ni uspel"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13188,7 +13305,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13389,7 +13506,7 @@ msgstr ""
 "\n"
 "Vzorca ni mo� najti\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Vzorca ni mo� najti"
 
@@ -13454,7 +13571,7 @@ msgstr "hexdump: slaba oblika [%s]\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: slab pretvorni znak %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13482,7 +13599,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13490,81 +13607,81 @@ msgstr ""
 "%s: Uporaba: %s [-�tevilo] [-p niz] [-cefnrs] [+vrstica] [+/vzorec/] "
 "[datoteke]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: izbira zahteva argument -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: nedovoljena izbira -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "... preskok naprej\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "... preskok nazaj\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Naslednje datoteke ni"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Prej�nje datoteke ni"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Napaka pri branju iz datoteke %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Nepri�akovan konec datoteke v %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Neznana napaka v datoteki %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Za�asne datoteke ni mogo�e ustvariti\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "napaka RE: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(EOF)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Shranjenega iskalnega niza ni"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Ni mogo�e odpreti "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "shranjeno"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !ukaz ni dovoljen v rflag na�inu.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "klic fork() ni uspel, poskusite pozneje\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Naslednja datoteka: "
 
@@ -13632,8 +13749,8 @@ msgstr "Uporaba: %s [izbire] naprava ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13649,39 +13766,105 @@ msgstr "%s: odpiranje ni uspelo: %s\n"
 msgid "no input file specified"
 msgstr "Izbira --date ni bila podana.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Uporaba: %s [izbire] naprava ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "pri branju terminfo baze podatk. je pri�lo do napake"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Na vhodu je neznano ube�no zaporedje: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Vhodna vrstica je predolga.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Uporaba:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Napaka pri zapiranju datoteke\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "�al lahko spremenite Oznako nepraznih razdelkov.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Opozorilo: razdelek %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Opozorilo: razdelki %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "in %s se prekrivata\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "naprava: npr. /dev/hda ali /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "bajtov"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Uporaba: %s [izbire] naprava ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Uporaba: %s [izbire] naprava ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13826,28 +14009,11 @@ msgstr "Vhodna vrstica je predolga.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [ali --help]:     izpi�i to sporo�ilo"
 
-#~ msgid "dangerous options:"
-#~ msgstr "nevarne izbire:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [ali --show-geometry]: izpi�i geometrijo tako, kot ga razume jedro"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [ali --show-pt-geometry]: izpi�i uganjeno gometrijo iz tabele "
-#~ "razdelkov"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [ali --show-extended]: izpi�i tudi raz�irjene razdelke ali\n"
-#~ "                              pri�akuj opisnike na vhodu"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -13908,53 +14074,9 @@ msgstr "Vhodna vrstica je predolga.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [izbire] [--] optstring parametri\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [izbire] -o|--izbire optstring [izbire] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              parametri\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a. --alternative            Dovoli dolge izbire, ki se za�nejo z enim "
-#~ "-\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h  --help                   Manj�a navodila\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l  --longoptions=dolgeizbire   Dolge izbire za prepoznavo\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=imeprograma       Ime na katerega se naslavljajo napake\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=nizizbir       Kratke izbire za prepoznavo\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Onemogo�i getopt(3) poro�anje napak\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Brez normalnega izhoda\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s,  --shell=lupina          Nastavi lupinsko konvencijo citiranja\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T. --test                   Test za razli�ico getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 Ne citiraj izhoda\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Izpi�i informacije o razli�ici\n"
-
 #, fuzzy
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getpot (raz�irjen) 1.1.3\n"
diff --git a/po/sv.po b/po/sv.po
index ae410dc7e..163e64205 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.13.1-rc1\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2007-11-14 09:20+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -111,29 +111,29 @@ msgstr "läs om partitionstabellen"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "hämta storlek i 512-byte sektorer"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "kan inte öppna %s"
@@ -212,7 +212,7 @@ msgid "Verifying ... "
 msgstr "Verifierar... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Kan inte öppna filen \"%s\""
@@ -252,15 +252,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -273,7 +273,7 @@ msgstr "%s från %s\n"
 msgid "cannot stat file %s"
 msgstr "kan inte ta status på enheten %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -322,8 +322,8 @@ msgid "stat failed: %s"
 msgstr "(Nästa fil: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty misslyckades\n"
@@ -552,55 +552,55 @@ msgstr "%s: ogiltigt cramfs--ogiltigt fildataavstånd\n"
 msgid "compiled without -x support"
 msgstr "%s: kompilerad utan stöd för -x\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Användning: %s [-larvsmf] /dev/namn\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s är monterad.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Vill du verkligen fortsätta"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "kontroll avbruten.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Zonnummer < \"FIRSTZONE\" i filen \"%s\"."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Zonnummer >= \"ZONES\" i filen \"%s\"."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Ta bort block"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Läsfel: kan inte söka till blocket i filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Läsfel: felaktigt block i filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -609,296 +609,296 @@ msgstr ""
 "Internt fel: försöker att skriva felaktigt block\n"
 "Skrivbegäran ignoreras\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "sökning misslyckades i \"write_block\""
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Skrivfel: felaktigt block i filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "sökning misslyckades i \"write_super_block\""
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "kan inte skriva superblock"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Kan inte skriva inodstabell"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Kan inte skriva zontabell"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Kan inte skriva inoder"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "sökning misslyckades"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "kan inte allokera buffertar för tabeller"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "kan inte läsa superblock"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "felaktig magisk siffra i superblocket"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Endast 1 kB stora block/zoner stöds"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "felaktigt \"s_imap_blocks\"-fält i superblocket"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "felaktigt \"s_zmap_blocks\"-fält i superblocket"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Kan inte allokera buffert för inodstabell"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Kan inte allokera buffert för zonkarta"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Kan inte allokera buffert för inoder"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Kan inte allokera buffert för inodsräknare"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Kan inte allokera buffert för zonräknare"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Kan inte läsa inodstabell"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Kan inte läsa zontabell"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Kan inte läsa inoder"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Varning: \"Firstzone\" != \"Norm_firstzone\"\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inoder\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld block\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "\"Firstdatazone\"=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonstorlek=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxstorlek=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Filsystemstillstånd=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "\"namelen\"=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inod %d är markerad som oanvänd, men används för filen \"%s\"\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Märk som använd"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Filen \"%s\" har rättigheterna %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Varning: antalet inoder är för stort.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "rotinoden är inte en katalog"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blocket har använts tidigare. Nu i filen \"%s\"."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Töm"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Block %d i filen \"%s\" är markerat som oanvänt."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Korrigera"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 "Katalogen \"%s\" innehåller ett felaktigt inodsnummer för filen \"%.*s\"."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Ta bort"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: felaktig katalog: \".\" kommer inte först\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: felaktig katalog: \"..\" kommer inte på andra plats\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "internt fel"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: felaktig katalog: storlek < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "sökning misslyckades i \"bad_zone\""
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Inod %d är inte tömd."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inod %d är oanvänd, markerad som använd i bittabellen."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inod %d är använd, markerad som oanvänd i bittabellen."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Ställ in"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inod %d (rättighet = %07o), i_nlinks=%d, räknade=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Ställ i_nlinks till räknat antal"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Zon %d: markerad som använd, ingen fil använder den."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Avmarkera"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Zon %d: används, räknade=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Zon %d: används inte, räknade=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "felaktig storlek på inod"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "felaktig storlek på v2-inod"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "behöver terminal för interaktiva reparationer"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "kan inte öppna \"%s\""
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s är rent, ingen kontroll.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Tvingar filsystemskontroll på %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Filsystemet på %s är smutsigt, behöver kontroll.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -907,12 +907,12 @@ msgstr ""
 "\n"
 "%6ld inoder används (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld zoner används (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -935,7 +935,7 @@ msgstr ""
 "------\n"
 "%6d filer\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1059,7 +1059,7 @@ msgstr "för många inoder - max är 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "inte tillräckligt med utrymme, behöver minst %lu block"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Enhet: %s\n"
@@ -1233,10 +1233,8 @@ msgstr "%6.2f%% (%+d byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Fel vid stängning av fil\n"
+msgid "cannot close file %s"
+msgstr "Kan inte öppna filen \"%s\""
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1347,88 +1345,98 @@ msgstr ""
 "VARNING: enhetsnummer avkortade till %u bitar. Detta betyder med största\n"
 "sannolikhet att en del enhetsfiler kommer att vara felaktiga.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Användning: %s [-c | -l filnamn] [-nXX] [-iXX] /dev/namn [block]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s är monterad; kommer inte att skapa ett filsystem här!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "sökning till startblock misslyckades i \"write_tables\""
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "kan inte tömma startsektor"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "sökning misslyckades i \"write_tables\""
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "kan inte skriva superblock"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "kan inte skriva inodstabell"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "kan inte skriva zontabell"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "kan inte skriva inoder"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "sökning misslyckades i \"write_block\""
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "skrivning misslyckades i \"write_block\""
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "för många felaktiga block"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "inte tillräckligt med korrekta block"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "kan inte allokera buffertar för tabeller"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "kan inte allokera buffertar för tabeller"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "kan inte allokera buffert för inoder"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inoder\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld block\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1437,97 +1445,97 @@ msgstr ""
 "Maxstorlek=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "sökning misslyckades under test av block"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Konstiga värden i \"do_check\": troligtvis programfel\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "sökning misslyckades i \"check_blocks\""
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "felaktiga block före dataområde: kan inte skapa filsystem"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d felaktiga block\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "ett felaktigt block\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "kan inte öppna fil med felaktiga block"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "Kan inte inte läsa diskenhet"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "felaktig storlek på inod"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol-fel: antalet block är inte angivet"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s misslyckades.\n"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty misslyckades\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: enheten är upptagen"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "kommer inte att försöka skapa filsystem på \"%s\""
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Antal sektorer"
@@ -1861,7 +1869,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "sökning misslyckades i \"write_tables\""
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2207,7 +2215,7 @@ msgid "   Logical"
 msgstr "   Logisk "
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -2885,12 +2893,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD-disketikettskommando (m för hjälp): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Första %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Sista %s eller +storlek eller +storlekM eller +storlekK"
@@ -3036,7 +3044,7 @@ msgid "tracks/cylinder"
 msgstr "spår/cylinder"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "cylindrar"
 
@@ -3106,12 +3114,12 @@ msgstr "Det maximala antalet partitioner har skapats\n"
 msgid "This partition already exists.\n"
 msgstr "Denna partition finns redan.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Varning: för många partitioner (%d, max är %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3314,7 +3322,7 @@ msgstr "Du måste ställa in"
 msgid "heads"
 msgstr "huvuden"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektorer"
 
@@ -3750,7 +3758,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Start     Början        Slut     Block    Id  System\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Enhet"
 
@@ -3835,7 +3843,7 @@ msgstr "Totala antalet allokerade sektorer %ld är större än maximala %lld\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld oallokerade sektorer\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3994,37 +4002,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Synkroniserar hårddiskar.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Partition %d har inget dataområde\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Ny början utav data"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Expertkommando (m för hjälp): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Antal cylindrar"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Antal huvuden"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Antal sektorer"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Varning: ställer in sektoravstånd för DOS-kompatibilitet\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4037,32 +4045,32 @@ msgstr ""
 "saknar stöd för GPT. Använd GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Disk %s innehåller inte en giltig partitionstabell\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "kan inte öppna %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: okänt kommando\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Denna kärna hittar själv sektorstorleken - flaggan -b ignoreras\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4071,16 +4079,16 @@ msgstr ""
 "Varning: flaggan -b (ställ in sektorstorlek) måste användas med en angiven "
 "enhet\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Upptäckte en OSF/1-disketikett på %s, går in i disketikettsläge.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Kommando (m för hjälp): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4089,16 +4097,16 @@ msgstr ""
 "\n"
 "Aktuell startfil är: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Ange namnet på den nya startfilen: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Startfilen oförändrad\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4427,9 +4435,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tDu har valt ett ovanligt namn på startfilen.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Tyvärr, du kan ändra taggen på icke-tomma partitioner.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Tyvärr, endast superanvändaren kan ändra systemklockan.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4446,7 +4454,7 @@ msgstr ""
 "får lov att bryta mot detta. Skriv in JA om du är säker på att\n"
 "du vill ge denna partition en annan tagg.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "JA\n"
 
@@ -4647,7 +4655,7 @@ msgstr "Oanvänt mellanrum - sektorerna 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Oanvänt mellanrum - sektorerna %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4656,7 +4664,7 @@ msgstr ""
 "Andra partitioner täcker redan hela hårddisken.\n"
 "Ta bort/krymp dem innan du försöker igen.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4665,12 +4673,12 @@ msgstr ""
 "Det rekommenderas varmt att den elfte partitionen\n"
 "täcker hela hårddisken och är av typen \"SGI-volym\"\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4680,7 +4688,7 @@ msgstr ""
 "Du har inte täckt hela hårddisken med den tredje partitionen, men ditt\n"
 "värde %d %s täcker en annan partition. Din inmatning har ändrats till %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4689,7 +4697,7 @@ msgstr ""
 "Om du vill behålla kompatibilitet med SunOS/Solaris bör du lämna denna\n"
 "partition som Hela disken (5), med början på 0, och med %u sektorer\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4707,7 +4715,7 @@ msgstr ""
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4732,7 +4740,7 @@ msgstr ""
 # · (centered dot) is normally used as the multiplication sign in Swedish.
 # See "Svenska skrivregler" §260.
 #
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4745,28 +4753,28 @@ msgstr ""
 "Enheter = %s av %d · 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flagga  Början      Slut   Block    Id  System\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Antal alternerande cylindrar"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Extra sektorer per cylinder"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Mellanrumsfaktor"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Rotationshastighet (varv per minut)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Antal fysiska cylindrar"
 
@@ -5225,7 +5233,7 @@ msgstr "Disk %s: kan inte få tag i geometri\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: kan inte få tag i storlek\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5236,22 +5244,22 @@ msgstr ""
 "hela disken. Att använda fdisk på det är troligtvis meningslöst.\n"
 "[Använd flaggan --force om du verkligen vill detta]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Varning: HDIO_GETGEO säger att det finns %lu huvuden\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Varning: HDIO_GETGEO säger att det finns %lu sektorer\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Varning: BLKGETSIZE/HDIO_GETGEO säger att det finns %lu cylindrar\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5261,7 +5269,7 @@ msgstr ""
 "Detta kommer att ge problem med all programvara som använder C/H/S-"
 "adressering.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5270,7 +5278,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu cylindrar, %lu huvuden, %lu sektorer/spår\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5278,7 +5286,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på huvud: %lu (måste vara mellan 0-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5287,7 +5295,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på sektor: %lu (måste vara mellan 1-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5296,7 +5304,7 @@ msgstr ""
 "%s på partition %s har omöjligt värde på cylinder: %lu (måste vara mellan 0-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5305,12 +5313,12 @@ msgstr ""
 "Id  Namn\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Läser om partitionstabellen...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5320,26 +5328,26 @@ msgstr ""
 "Kommandot för att läsa om partitionstabellen misslyckades\n"
 "Starta om ditt system nu, innan du använder mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Fel vid stängning av %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: det finns ingen sådan partition\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "okänt format - använder sektorer\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "oimplementerat format - använder %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5348,12 +5356,12 @@ msgstr ""
 "Enheter = cylindrar med %lu byte, block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Enhet Start Början   Slut     Cyl.     Block   Id  System\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5362,12 +5370,12 @@ msgstr ""
 "Enheter = sektorer med 512 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Enhet Start   Början      Slut   Sektorer  Id  System\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5376,12 +5384,12 @@ msgstr ""
 "Enheter = block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Enhet Start  Början      Slut      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5390,31 +5398,31 @@ msgstr ""
 "Enheter = mebibyte med 1048576 byte, block med 1024 byte, räknat från %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Enhet Start Början Slut    MiB      Block   Id  System\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tbörjan: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tslut: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) hittades\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partitionen slutar på cylinder %ld, utanför slutet på hårddisken\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Inga partitioner hittades\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5425,51 +5433,41 @@ msgstr ""
 "  för C/H/S=*/%ld/%ld (istället för %ld/%ld/%ld).\n"
 "I denna visning kommer jag att antaga den geometrin.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "ingen partitionstabell finns tillgänglig.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "konstigt, endast %d partitioner är angivna.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Varning: partition %s har storlek 0 men är inte markerad tom\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Varning: partition %s har storlek 0 och är startbar\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Varning: partition %s har storlek 0 och en början som inte är 0\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Varning: partition %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "är inte innesluten i partition %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Varning: partitionerna %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "och %s överlappar varandra\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Varning: partition %d är tom\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5478,17 +5476,17 @@ msgstr ""
 "Varning: partition %s innehåller en del av partitionstabellen (sektor %lu),\n"
 "och kommer att förstöra den då den fylls\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Varning: partition %s börjar på sektor 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Varning: partition %s fortsätter utanför hårddisken\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5496,17 +5494,17 @@ msgstr ""
 "Endast en av de primära partitionerna kan vara utökad\n"
 " (även om detta inte är ett problem under Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Varning: partition %s börjar inte på en jämn cylindergräns\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Varning: partition %s slutar inte på en jämn cylindergräns\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5515,7 +5513,7 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5523,7 +5521,7 @@ msgstr ""
 "Varning: normalt kan man endast starta från primära partitioner\n"
 "LILO ignorerar startbarhetsflaggan.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5532,11 +5530,11 @@ msgstr ""
 "LILO bryr sig inte om detta, men DOS huvudstartpost (MBR) kommer inte att\n"
 "kunna starta denna disk.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "början"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5544,23 +5542,23 @@ msgstr ""
 "partition %s: början: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "slut"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "partition %s: slut: (c,h,s) (%ld,%ld,%ld) förväntades (%ld,%ld,%ld) "
 "hittades\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "partition %s slutar på cylinder %ld, utanför slutet på hårddisken\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5569,7 +5567,7 @@ msgstr ""
 "Varning: ändrade början på extd-partitionen från %ld till %ld\n"
 "(Endast för listningsändamål. Ändra inte dess innehåll).\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5577,132 +5575,132 @@ msgstr ""
 "Varning: utökad partition börjar inte på jämn cylindergräns.\n"
 "DOS och Linux kommer att tolka innehållet annorlunda.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "för många partitioner - ignorerar de efter nummer (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "träd med partitioner?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "upptäckte Disk Manager - kan inte hantera det\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "DM6-signatur hittades - ger upp\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "konstigt, en utökad partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "konstigt, en BSD-partition med storlek 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: okänd typ av partitionstabell\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "Flaggan -n angavs: Inget ändrades\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Misslyckades med att spara de gamla sektorerna - avbryter\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Misslyckades med att skriva partitionen på %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "lång eller ofullständig indatarad - avslutar\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "indatafel: \"=\" förväntas efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "indatafel: oväntat tecken %c efter %s-fält\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "okänd indata: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "talet är för stort\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "eftersläpande skräp efter tal\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "ingen plats för partitionshandtag\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "kan inte bygga omgivande utökad partition\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "för många indatafield\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Inte plats för mer\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Ogiltig typ\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Varning: angiven storlek (%lu) överskrider största tillåtna storleken (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Varning: tom partition\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Varning: felaktig början på partition (första %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "okänd startbarhetsflagga - välj - eller *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "c,h,s-specifikation ofullständig?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Utökad partition finns inte där den förväntades\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "felaktig indata\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "för många partitioner\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5712,99 +5710,180 @@ msgstr ""
 "<början> <storlek> <typ [E,S,L,X,hex]> <startbar [-,*]> <c,h,s> <c,h,s>\n"
 "Vanlligtvis behöver du bara ange <början> och <storlek> (och kanske <typ>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Användning: %s [flaggor] enhet ...\n"
+msgstr "Användning:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "enhet: någonting liknande /dev/hda eller /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d partitioner:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "farliga flaggor:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [eller --show-pt-geometry]: skriv ut gissad geometri från "
+"partitionstabellen"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [eller --show-extended]: visa även utökade partitioner i utdata\n"
+"                                eller förvänta handtag för dem som indata"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Användning:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s enhet\t\t visa aktiva partitioner på enhet\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s enhet n1 n2 ... aktivera partitioner n1 ..., deaktivera resten\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An enhet\t aktivera partition n, deaktivera de andra\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5817,62 +5896,62 @@ msgstr ""
 "saknar stöd för GPT. Använd GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Använd flaggan --force för att undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "inget kommando?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "totalt: %llu block\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "användning: sfdisk --print-id enhet partitionsnummer\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "användning: sfdisk --change-id enhet partitionsnummer Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "användning: sfdisk --id enhet partitionsnummer [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "kan endast ange en enhet (utom med -l eller -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "kan inte öppna %s för läsning och skrivning\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "kan inte öppna %s för läsning\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld cylindrar, %ld huvuden, %ld sektorer/spår\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Kan inte hämta storleken på %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "felaktig aktiv byte: 0x%x istället för 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5880,7 +5959,7 @@ msgstr ""
 "Färdig\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5890,35 +5969,35 @@ msgstr ""
 "DOS huvudstartpost (MBR) kan endast starta en hårddisk med 1 aktiv\n"
 "partition.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "partition %s har id %x och är inte dold\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Felaktigt Id %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Denna hårddisk används för tillfället.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ödesdigert fel: kan inte hitta %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Varning: %s är ingen blockenhet\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Kontrollerar att ingen använder hårddisken just nu...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5931,30 +6010,30 @@ msgstr ""
 "på denna disk är utväxlade. Använd flaggan --no-reread för att\n"
 "undertrycka denna kontroll.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Använd flaggan --force för att undertrycka alla kontroller.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tidigare situation:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Partition %d finns inte, kan inte ändra den\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Ny situation:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5962,21 +6041,21 @@ msgstr ""
 "Jag gillar inte dessa partitioner - ingenting ändrades.\n"
 "(Om du verkligen vill göra detta bör du använda flaggan --force).\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Jag gillar inte detta - du bör nog svara nej\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Är du nöjd med detta? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Vill du skriva detta till disk? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5985,16 +6064,16 @@ msgstr ""
 "\n"
 "sfdisk: för tidigt slut på indata\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Avslutar - ingenting ändrades\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Svara med ett av y, n eller q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -6003,7 +6082,7 @@ msgstr ""
 "Lyckades skapa den nya partitionstabellen\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6035,101 +6114,103 @@ msgstr "Synkroniserar hårddiskar.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s lyckades.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s misslyckades.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: kan inte öppna %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s hittades inte"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: fel %d vid uppackning! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s är ingen lp-enhet.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Tvingar filsystemskontroll på %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6137,58 +6218,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s är ingen lp-enhet.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Kunde inte öppna %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s avmonterad\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Avmonterar alla återstående filsystem..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Avmonterar alla återstående filsystem..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: okänt argument: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6207,33 +6288,78 @@ msgstr "tom lång flagga efter argumenten -l eller --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "okänt skal efter argumenten -s eller --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [flaggor] -o|--options flaggsträng [flaggor] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            Tillåt långa flaggor som börjar med ensamt -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Denna enkla användningsguide\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=långflg    Långa flaggor att känna igen\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=programnamn       Det namn under vilket fel rapporteras\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=flaggsträng    Korta flaggor att känna igen\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  Stäng av felrapportering av getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Ingen normal utdata\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=skal             Ställ in konventioner för skalcitering\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Undersök getopt(1)-version\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unquote                Citera inte utdata\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Skriv ut versionsinformation\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "flaggsträngsargument saknas"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "internt fel, kontakta författaren."
 
@@ -6696,70 +6822,88 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Kan inte ställa in epokvärdet i kärnan.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d partitioner:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
@@ -6767,22 +6911,22 @@ msgstr ""
 "(8))\n"
 
 # audit är inget svenskt ord men hittar inte passande. revision? granskning?
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: Kunde inte ansluta till auditsystem\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s tar inga argument som inte är flaggor. Du angav %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6791,7 +6935,7 @@ msgstr ""
 "Du har angivit flera funktioner\n"
 "Du kan bara utföra en funktion åt gången.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6800,7 +6944,7 @@ msgstr ""
 "%s: Flaggorna --utc och --localtime är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6809,7 +6953,7 @@ msgstr ""
 "%s: Flaggorna --adjust och --noadjfile är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6818,39 +6962,39 @@ msgstr ""
 "%s: Flaggorna --adjust och --noadjfile är ömsesidigt uteslutande. Du angav "
 "båda.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: Med --noadjfile måste du ange antingen --utc eller --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Ingen användbar tid att ställa. Kan inte ställa klockan.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Tyvärr, endast superanvändaren kan ändra hårdvaruklockan.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Tyvärr, endast superanvändaren kan ändra systemklockan.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr ""
 "Tyvärr, endast superanvändaren kan ändra hårdvaruklockans epok i kärnan.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "Kan inte komma åt hårdvaruklockan via någon känd metod.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7029,7 +7173,7 @@ msgid "failed to read mtab"
 msgstr "kan inte ta status på %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "Kan inte allokera buffert.\n"
@@ -7071,45 +7215,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7118,27 +7302,27 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: montering misslyckades"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "Kan inte allokera buffert.\n"
@@ -7225,7 +7409,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "chsh: PAM-fel, avbryter: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Lösenord: "
 
@@ -7672,47 +7856,48 @@ msgstr "FÖR MÅNGA nyrader"
 msgid "too many bare linefeeds."
 msgstr "för många tomma nyrader.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Inloggning gjorde time-out efter %d sekunder\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Senaste inloggning: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "från %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "på %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "Öppning av %s misslyckades"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "MISSLYCKAD INLOGGNING FRÅN %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "MISSLYCKAD INLOGGNING PÅ %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR FRÅN %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d MISSLYCKADE INLOGGNINGAR PÅ %s, %s"
@@ -7742,7 +7927,7 @@ msgstr "mount: åtkomst nekas"
 msgid "setuid failed"
 msgstr "setuid() misslyckades"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "körning misslyckades\n"
@@ -7798,8 +7983,8 @@ msgstr "%s: Kan inte ställa in sammanhang för %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: kan inte låsa upp %s: %s (dina ändringar är fortfarande i %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "grening misslyckades\n"
@@ -7852,24 +8037,21 @@ msgstr "ogiltigt årsvärde: använd 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "användning: cal [-13smjyV] [[månad] år]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7981,32 +8163,32 @@ msgstr " Ta bort"
 msgid "failed to add line to output"
 msgstr "Kan inte allokera buffert.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "sökfel"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "Kan inte allokera buffert.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: kan inte läsa %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "Kan inte allokera buffert.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc() misslyckades"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8017,49 +8199,74 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Tillgängliga kommandon:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8068,42 +8275,42 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Katalogen %s finns inte!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "Kan inte allokera buffert.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "Kan inte allokera buffert.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "Kan inte allokera buffert.\n"
@@ -8128,12 +8335,12 @@ msgstr "%s: kan inte hitta processen \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: okänd signal %s; giltiga signaler:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "användning: %s [ -s signal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signal ]\n"
@@ -8153,84 +8360,83 @@ msgstr "Blockstorlek: %d\n"
 msgid "connect %s"
 msgstr "nfs-anslut"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs-uttag"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs-anslut"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Nästa fil: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Värdet är utanför intervallet.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: okänt facilitetsnamn: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: okänt prioritetsnamn: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8368,7 +8574,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8386,12 +8592,13 @@ msgstr "%s: misslyckades med att öppna: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8399,7 +8606,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8422,7 +8629,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8431,33 +8638,33 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Kunde inte öppna %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Fick %d byte från %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "körning misslyckades\n"
@@ -8477,24 +8684,12 @@ msgstr "kan inte ta status på enheten %s"
 msgid "%s - No such file or directory\n"
 msgstr "rotinoden är inte en katalog"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "användning: namei [-mx] sökväg [sökväg ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d partitioner:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8506,8 +8701,8 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, fuzzy, c-format
+#: misc-utils/namei.c:425
+#, fuzzy
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8515,12 +8710,12 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date-argumentet är för långt\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8530,169 +8725,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: namnbyte av %s till %s misslyckades: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: felaktigt argument %s till -l.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Skriv"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "läste %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "kan inte ta status på %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Kan inte öppna %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Fel vid läsning av %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "ogiltigt id"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "ogiltigt id"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: felaktigt värde\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "fel vid byte av rättigheter på %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8700,29 +8893,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8756,32 +8948,33 @@ msgid "%s: write failed"
 msgstr "openpty misslyckades\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "byte"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8790,11 +8983,11 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8886,63 +9079,63 @@ msgstr "fel vid byte av rättigheter på %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "kan inte byta namn på %s till %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: användaren \"%s\" finns inte.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: kan inte få tag i information om enheten %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", avstånd %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", storleksgräns %lld"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", kryptering %s (typ %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", avstånd %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", krypteringstyp %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: kan inte få tag i information om enheten %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: inga rättigheter att granska /dev/loop#"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: kunde inte hitta någon ledig slingenhet"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8952,56 +9145,54 @@ msgstr ""
 "       till slingenheten? (Om det är så bör du kompilera om eller\n"
 "       \"modprobe loop\")."
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Slut på minne vid växande av buffert.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektor %d är redan allokerad\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s är skrivskyddad, monterar som endast läsbar"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Kunde inte låsa i minne, avslutar.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD misslyckades: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): lyckades\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): lyckades\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: kan inte ta bort enheten %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Denna mount kompilerades utan stöd för slingor. Du bör kompilera om.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9009,7 +9200,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "användning:\n"
 "  %s slingenhet                                        # ge information\n"
@@ -9017,19 +9208,17 @@ msgstr ""
 "  %s -f                                                # hitta ledig\n"
 "  %s [-e kryptering] [-o avstånd] {-f|slingenhet} fil  # konfiguration\n"
 
-#: mount/lomount.c:1023
-#, fuzzy, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9050,32 +9239,32 @@ msgstr ""
 " -v | --verbose           informativt läge\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: kan inte öppna enheten %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, fuzzy, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "mount: stulen loop=%s ...försöker igen\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: enheten är upptagen"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9638,163 +9827,166 @@ msgstr "programfel i xstrndup-anrop"
 msgid "not enough memory"
 msgstr "inte tillräckligt med minne"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Oväntat filslut i %s-fil\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "körning misslyckades\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() misslyckades"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "sökning misslyckades"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Öppning av %s misslyckades"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Namn"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: varning: %s har osäkra rättigheter %04o, föreslår %04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: varning: %s har osäkra rättigheter %04o, föreslår %04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: Hoppar över filen %s - den verkar innehålla hål.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "sökning misslyckades"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s på %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s misslyckades.\n"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: kan inte hitta enheten för %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "Inte superanvändare.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s misslyckades.\n"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10068,7 +10260,7 @@ msgstr "Valde partition %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10128,19 +10320,13 @@ msgstr "   p   skriv ut BSD-partitionstabell"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Disk %s innehåller inte en giltig partitionstabell\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10151,21 +10337,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Tillgängliga kommandon:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10174,26 +10359,26 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "Kan inte allokera buffert.\n"
@@ -10321,7 +10506,7 @@ msgstr "Misslyckades med att ställa in personlighet till %s"
 msgid "failed to set pid %d's policy"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() misslyckades med att läsa tid från %s"
@@ -10593,7 +10778,7 @@ msgstr "%s: %ld standardtröskel och %ld standardtimeout\n"
 msgid "Can't set signal handler"
 msgstr "Kan inte ställa in signalhanterare"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday misslyckades"
 
@@ -10602,7 +10787,7 @@ msgstr "gettimeofday misslyckades"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Kan inte utlysa CYGETMON på %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10610,12 +10795,12 @@ msgstr ""
 "%s: %lu avbrott, %lu/%lu tecken; fifo: %lu tröskel, %lu time-out, %lu max, "
 "%lu nu\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f avbrott/s; %f mott., %f skickat (tecken/s)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10623,7 +10808,7 @@ msgstr ""
 "%s: %lu avbrott, %lu tecken; fifo: %lu tröskel, %lu time-out, %lu max, %lu "
 "nu\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f avbrott/sek; %f mott. (tecken/s)\n"
@@ -10715,124 +10900,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Användning: %s [flaggor] enhet ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Okänt kommando: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Katalogen %s finns inte!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync misslyckades"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Nästa fil: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "inget kommando?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync misslyckades"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10840,7 +11008,7 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10849,36 +11017,36 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Inte tillräckligt många argument"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Ogiltigt inställt värde: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "Ingen --date-flagga angavs.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "maximalt antal segment = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty misslyckades\n"
@@ -10886,63 +11054,64 @@ msgstr "openpty misslyckades\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s kräver ett argument\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: kan inte öppna %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: felaktigt värde\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "grening misslyckades\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -10950,38 +11119,37 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "Ingen --date-flagga angavs.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "Ingen --date-flagga angavs.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s misslyckades.\n"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "rotinoden är inte en katalog"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "openpty misslyckades\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "openpty misslyckades\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10990,8 +11158,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -10999,96 +11167,87 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() misslyckades med att läsa tid från %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "Ingen --date-flagga angavs.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "rotinoden är inte en katalog"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "openpty misslyckades\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Användning: %s [flaggor] enhet ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, fuzzy, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Delat minnessegment shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "Meddelandekö meddköid=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "allokerade semaforer = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11585,8 +11744,8 @@ msgstr ""
 "Delat minnessegment shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11595,8 +11754,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "rättighet=%#o\tåtkomsträttigheter=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11629,8 +11788,8 @@ msgstr ""
 "Meddelandekö meddköid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\trättighet=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11663,8 +11822,8 @@ msgstr ""
 "Semaforvektor semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11712,71 +11871,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s från %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "ogiltigt id"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "ogiltigt id: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s är ingen blockspecialenhet"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "kan inte hämta storleken på %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Kan inte söka på diskenhet"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "kan inte hämta storleken på %s"
@@ -11931,36 +12088,31 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -11969,12 +12121,12 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "rotinoden är inte en katalog"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s är monterad.\t "
@@ -12010,55 +12162,50 @@ msgstr ""
 "\t -n              deaktivera automatisk detektering av byteordning\n"
 "\t -V              visa versionsinformation och avsluta\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: fel vid skrivning av %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Samplingssteg: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): felaktig tabellrad\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: kan inte hitta \"_stext\" i %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profiladressen är utanför intervallet. Fel tabellfil?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "totalt"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12067,8 +12214,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12076,69 +12223,61 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s från %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Okänt kommando: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "felaktigt timeoutvärde: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "användare"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Misslyckades med att ställa in personlighet till %s"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: gammal prioritet %d, ny prioritet %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Användning: %s [flaggor] enhet ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "användning: %s [flaggor]\n"
 "    -d | --device <enhet>     välj rtc-enhet (rtc0|rtc1|...)\n"
@@ -12150,8 +12289,8 @@ msgstr ""
 "    -v | --verbose            informativa meddelanden\n"
 "    -V | --version            visa version\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12159,162 +12298,162 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "läs rtc-tid"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "läs systemtid"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "konvertera rtc-tid"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "ställ in rtc-alarm"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "aktivera rtc-alarm"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "ställ in rtc-uppvakningsalarm"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "aktivera rtc-alarm"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "konvertera rtc-tid"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "%s: okänt väntelägestillstånd \"%s\"\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: misslyckades med att öppna: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: antar att RTC använder UTC ...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Använder %s-tid\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Använder %s-tid\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s: måste tillhandahålla uppvakningstid\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s är inte aktiverad för uppvakningshändelser\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "alarm %ld, sys_time %ld, rtc_time %ld, sekunder %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, fuzzy, c-format
 msgid "time doesn't go backward to %s"
 msgstr "%s: tiden går inte baklänges till %s\n"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: uppvakning från \"%s\" med %s klockan %s\n"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: uppvakning från \"%s\" med %s klockan %s\n"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() misslyckades med att läsa tid från %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Nästa fil: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 #, fuzzy
 msgid "disable rtc alarm interrupt failed"
 msgstr "inaktivera rtc-alarmavbrott"
@@ -12373,16 +12512,16 @@ msgstr ""
 "%s: %s\n"
 "Prova med \"%s --help\" för mer information.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: Arkitekturen är okänd"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Inte tillräckligt många argument"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Misslyckades med att ställa in personlighet till %s"
@@ -12467,24 +12606,22 @@ msgstr "%s använder IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s använder pollning\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "användning: %s program [argument ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12492,150 +12629,150 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "sökning misslyckades"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: kan inte ställa in grupp-id: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: kan inte ställa in användar-id: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: kan inte köra %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "fel vid byte av rättigheter på %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: kan inte hitta processen \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: kan inte köra %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "Kan inte allokera buffert.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "felaktigt timeoutvärde: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Inte tillräckligt många argument"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "Kan inte allokera buffert.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "felaktig hastighet: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "för många alternativa hastigheter"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: kan inte öppna som standard in: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: ingen teckenenhet"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: inte öppen för läsning/skrivning"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: dupliceringsproblem: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "typ: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: läste: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: indataspill"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12647,69 +12784,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "användare"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "användare"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "sökning misslyckades"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Nästa fil: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "är på (y)\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "är av (n)\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "allokerade semaforer = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "ogiltigt id: %s\n"
@@ -12725,52 +12856,46 @@ msgstr ""
 "Använd \"%s [flaggor] %s\" om du verkligen vill använda den.\n"
 "Skriptet startades inte.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "Kan inte öppna filen \"%s\""
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Skriptet startades, filen är %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Skriptet startades %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: kan inte hitta enheten för %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12779,80 +12904,77 @@ msgstr ""
 "\n"
 "Skriptet färdigt %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Skriptet färdigt, filen är %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty misslyckades\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Slut på pty:er\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "Öppning av %s misslyckades"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() misslyckades med att läsa tid från %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "maximalt antal segment = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "Kan inte öppna filen \"%s\""
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() misslyckades med att läsa tid från %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: Oväntat filslut i %s-fil\n"
@@ -12863,50 +12985,47 @@ msgid "Argument error."
 msgstr "%s: Argumentfel, användning\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12915,61 +13034,61 @@ msgstr ""
 "\n"
 "För mer information, se setarch(8).\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "kan inte grena"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "kan inte grena"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "kan inte öppna %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "kan inte ställa in/återställa strömsparläget\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "kan inte öppna enhet %s för skrivning\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl-fel: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Fel vid skrivning av skärmdump\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Kunde inte öppna %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM är inte angiven.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: okänd signal %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12997,142 +13116,144 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Användning: %s [flaggor] enhet ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "ogiltigt id"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "felaktigt timeoutvärde: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: kan inte öppna temporär fil.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: kan inte ställa in användar-id: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Kan inte hämta diskstorlek"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Meddelande till alla från %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: kommer inte att läsa %s - använd standard in.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s misslyckades.\n"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Nästa fil: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "användning: namei [-mx] sökväg [sökväg ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: kan inte hitta namnet på din tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: du har inte skrivrättighet aktiverad.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s är inte inloggad på %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s har meddelanden avstängda på %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s är inte inloggad\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s har meddelanden avstängda\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s är loggad in mer än en gång; skriver till %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Indataraden är för lång.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Meddelande från %s@%s (som %s) på %s klockan %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Meddelande från %s@%s på %s klockan %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "minnesallokering misslyckades"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13313,7 +13434,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13516,7 +13637,7 @@ msgstr ""
 "\n"
 "Mönstret hittades inte\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Mönstret hittades inte"
 
@@ -13581,7 +13702,7 @@ msgstr "hexdump: felaktigt format {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: felaktigt konverteringstecken %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13609,7 +13730,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13617,81 +13738,81 @@ msgstr ""
 "%s: Användning: %s [-number] [-p sträng] [-cefnrs] [+rad] [+/mönster/] "
 "[filer]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: flaggan kräver ett argument -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: otillåten flagga -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...hoppar framåt\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...hoppar bakåt\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Ingen nästa fil"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Inga tidigare fil"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Läsfel från %s-fil\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Oväntat filslut i %s-fil\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Okänt fel i %s-fil\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Kan inte skapa temporär fil\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE-fel: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(Filslut)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Ingen ihågkommen söksträng"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Kan inte öppna "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "sparad"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !kommando inte tillåtet i rflag-läge.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() misslyckades, försök igen senare\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Nästa fil: "
 
@@ -13761,8 +13882,8 @@ msgstr "Användning: %s [flaggor] enhet ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13778,39 +13899,105 @@ msgstr "%s: misslyckades med att öppna: %s\n"
 msgid "no input file specified"
 msgstr "Ingen --date-flagga angavs.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Användning: %s [flaggor] enhet ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "problem vid läsning av terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Okänd inbäddningssekvens i indata: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Indataraden är för lång.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Användning:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Fel vid stängning av fil\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Tyvärr, du kan ändra taggen på icke-tomma partitioner.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Varning: partition %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Varning: partitionerna %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "och %s överlappar varandra\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "enhet: någonting liknande /dev/hda eller /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "byte"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Användning: %s [flaggor] enhet ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Användning: %s [flaggor] enhet ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13960,27 +14147,10 @@ msgstr "Indataraden är för lång.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [eller --help]:   visa detta meddelande"
 
-#~ msgid "dangerous options:"
-#~ msgstr "farliga flaggor:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g [eller --show-geometry]: visa kärnans bild av geometrin"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [eller --show-pt-geometry]: skriv ut gissad geometri från "
-#~ "partitionstabellen"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [eller --show-extended]: visa även utökade partitioner i utdata\n"
-#~ "                                eller förvänta handtag för dem som indata"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14045,53 +14215,9 @@ msgstr "Indataraden är för lång.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [flaggor] [--] flaggsträng parametrar\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [flaggor] -o|--options flaggsträng [flaggor] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              parametrar\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Tillåt långa flaggor som börjar med ensamt "
-#~ "-\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Denna enkla användningsguide\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=långflg    Långa flaggor att känna igen\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=programnamn       Det namn under vilket fel rapporteras\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=flaggsträng    Korta flaggor att känna igen\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Stäng av felrapportering av getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Ingen normal utdata\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=skal             Ställ in konventioner för skalcitering\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Undersök getopt(1)-version\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unquote                Citera inte utdata\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Skriv ut versionsinformation\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (utökad) 1.1.4\n"
 
diff --git a/po/tr.po b/po/tr.po
index 26b3af4ad..99ca03a57 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -10,8 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2006-03-06 15:45+0200\n"
 "Last-Translator: Nilgün Belma Bugüner <nilgun@buguner.name.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -114,29 +114,29 @@ msgstr "bölümleme tablosu yeniden okunur"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "boyutları bayt cinsinden verir"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s: (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "%s açılamıyor"
@@ -215,7 +215,7 @@ msgid "Verifying ... "
 msgstr "Doğrulanıyor..."
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "'%s' dosyası açılamıyor"
@@ -255,15 +255,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -276,7 +276,7 @@ msgstr "%2$s deki %1$s\n"
 msgid "cannot stat file %s"
 msgstr "%s aygıtının durum bilgisi alınamıyor"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -325,8 +325,8 @@ msgid "stat failed: %s"
 msgstr "(Sonraki dosya: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "openpty başarısız\n"
@@ -557,55 +557,55 @@ msgstr "%s: geçersiz cramfs -- geçersiz dosya verisi başlangıcı\n"
 msgid "compiled without -x support"
 msgstr "%s: -x desteği olmaksızın derlenmiş\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: TAMAM\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "kullanımı: %s [-larvsmf] /dev/İSİM\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s bağlı.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Gerçekten devam etmek istiyor musunuz?"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "denetim durdu.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "`%s' dosyasındaki bölge No < İLKBÖLGE."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "`%s' dosyasındaki bölge No >= BÖLGE sayısı."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "blok kaldırılsın mı?"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Okuma hatası: '%s' dosyasındaki bloğa erişilemiyor\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Okuma hatası: '%s' dosyasındaki bir blok bozuk\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -614,296 +614,296 @@ msgstr ""
 "Bozuk bloğa yazmaya çalışılırken iç hata oluştu:\n"
 "Yazma isteği yoksayıldı\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "write_block işleminde erişim sağlanamadı"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Yazma hatası: '%s' dosyasındaki bir blok bozuk\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "super-blok yazma işleminde erişim sağlanamadı"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "super-bloka yazılamadı"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "düğüm eşlemi yazılamıyor"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "bölge tablosu yazılamıyor"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Düğümler yazılamıyor"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "erişim başarısız"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "tablolar için tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "super blok okunamıyor"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "super-bloktaki betimleyici numara hatalı"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Sadece 1k blok/bölge desteği var"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "super-bloktaki s_imap_blocks alanı bozuk"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "super-bloktaki s_zmap_blocks alanı bozuk"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "düğüm eşlemi için tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "düğüm eşlemi için tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Düğümler için tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Düğüm sayısı kadar tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "bölge sayısı kadar tampon bellek ayrılamıyor"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Düğüm eşlemi okunamıyor"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "bölge tablosu okunamıyor"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Düğümler okunamıyor"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Uyarı: İlkBölge != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld düğüm\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld blok\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "İlkVeriBölgesi = %ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "BölgeUzunluğu = %d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "AzamiUzunluk = %ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "DosyaSistemi durumu = %d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "isimUzunluğu = %d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "%d. düğüm serbest olarak imli ama '%s' dosyası için kullanılmış\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Kullanımda olarak imlensin mi?"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "`%s' %05o kipe sahip\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Uyarı: düğüm sayısı çok büyük.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "kök düğümü bir dizin değil"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Blok `%s' dosyası için kullanılıyor."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Temizlensin mi?"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "`%2$s' dosyasının %1$d. bloğu kullanımda değil olarak imli."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Doğru mu?"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "'%s' dizini '%.*s' dosyası için bir hatalı düğüm numarası içeriyor."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Silinsin mi?"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: dizin hatalı: '.' ilk değil\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: dizin hatalı: '..' ikinci değil\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "iç hata"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: dizin hatalı: uzunluk < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "bad_zone'da erişim başarısız"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "%d.düğümde kip temiz değil."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "%d. düğüm kullanımda değil ama biteşlemde kullanımda olarak imli."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "%d.düğüm kullanımda ama biteşlemde kullanımda değil olarak imli."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "İmlensin mi?"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Düğüm %d (kip = %07o), i_nlinks = %d, sayılan = %d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "i_nlinks bu sayıya ayarlansın mı?"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Bölge %d: kullanımda olarak imli ama hiçbir dosya kullanmıyor"
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "İm kaldırılsın mı?"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Bölge %d: kullanımda, sayılan = %d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Bölge %d: kullanım dışı, sayılan = %d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "düğüm sayısı hatalı"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "v2 düğüm sayısı hatalı"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "etkileşimli onarım için terminal gerekli"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "'%s' açılamıyor"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s temiz, denetim gereksiz.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "%s için dosya sistemi denetimi şart.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "%s üzerindeki dosya sistemi düzensiz, denetlenmesi gerekiyor.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -912,12 +912,12 @@ msgstr ""
 "\n"
 "%6ld düğüm kullanımda (%%%ld)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld bölge kullanımda (%%%ld)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -940,7 +940,7 @@ msgstr ""
 "------\n"
 "%6d dosya\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1064,7 +1064,7 @@ msgstr "düğüm sayısı çok fazla - en çok 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "yer yetersiz, en az %lu blok gerekiyor"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Aygıt: %s\n"
@@ -1234,10 +1234,8 @@ msgstr "%%%6.2f (%+d bayt)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Dosya kapatılırken hata\n"
+msgid "cannot close file %s"
+msgstr "'%s' dosyası açılamıyor"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1349,89 +1347,99 @@ msgstr ""
 "UYARI: aygıt numaraları %u bitle sınırlandı. Bu işlem bazı aygıt "
 "dosyalarının isimlerinin yanlış olmasına sebep olacak.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr ""
 "Kullanımı: %s [-c | -l dosyaismi] [-nXX] [-iXX] /dev/isim [blokSayısı]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s bağlı; burada bir dosya sistemi yapılmayacak!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "write_tables içinde başlatma bloğuna erişilemedi"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "başlatma sektörü temizlenemiyor"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "write_tables içinde erişim başarısız"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "super-bloka yazılamadı"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "düğüm eşlemi yazılamıyor"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "bölge tablosu yazılamıyor"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "düğümler yazılamıyor"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "write_block işleminde erişim sağlanamadı"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "write_block içine yazma başarısız"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "çok fazla hatalı blok var"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "iyi bloklar yetersiz"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "tablolar için tampon bellek ayrılamıyor"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "tablolar için tampon bellek ayrılamıyor"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "düğümler için tampon bellek ayrılamıyor"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld düğüm\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld blok\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1440,97 +1448,97 @@ msgstr ""
 "Azamiuzunluk = %ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "bloklar denetlenirken erişim başarısız"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check yapılırken tuhaf değerler: yazılım hatası olabilir\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "check_blocks işleminde erişim başarısız"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "veri alanından önceki bloklar hatalı: dosya sistemi yapılamıyor"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d bozuk blok\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "bir bozuk blok\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "bozuk bloklar dosyası açılamıyor"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "Disk sürücüsü okunamıyor"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "düğüm sayısı hatalı"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol hatası: blok sayısı belirtilmemiş"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "erişim başarısız"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "openpty başarısız\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: aygıt meşgul"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "'%s' üzerinde dosya sistemi oluşturmaya çalışılmayacak"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Sektör sayısı"
@@ -1869,7 +1877,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "write_tables içinde erişim başarısız"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2209,7 +2217,7 @@ msgid "   Logical"
 msgstr " Mantıksal "
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
@@ -2875,12 +2883,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD disk etiketi komutu (yardım için m): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "İlk %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Son %s, +size, +sizeM veya +sizeK"
@@ -3026,7 +3034,7 @@ msgid "tracks/cylinder"
 msgstr "iz/silindir"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "silindir"
 
@@ -3093,12 +3101,12 @@ msgstr "Oluşturulabilecek disk bölümlerinin tümü oluşturuldu\n"
 msgid "This partition already exists.\n"
 msgstr "Bu disk bölümü zaten var.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Uyarı: disk bölümü sayısı çok fazla (%d, en çok %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3302,7 +3310,7 @@ msgstr "Belirtilmeli"
 msgid "heads"
 msgstr "kafa"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "sektör"
 
@@ -3732,7 +3740,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Açılış    Başlangıç     Bitiş  BlokSayısı Kml Sistem\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Aygıt"
 
@@ -3821,7 +3829,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld sektör kullanılmamış\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "%d disk bölümü zaten atanmış. Yeniden eklemeden önce silmelisiniz.\n"
@@ -3977,37 +3985,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Diskler eşzamanlanıyor.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "%d disk bölümü veri alanına sahip değil\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Yeni veri başlangıcı"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Uzman komutları (yardım için m): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Silindir sayısı"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Kafa sayısı"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Sektör sayısı"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Uyarı: Sektör hizalaması DOS uyumlu olarak yapılıyor\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4016,33 +4024,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "%s diski geçerli bir disk bölümleme tablosu içermiyor\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "%s açılamıyor\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: komut bilinmiyor\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Bu çekirdek sektör uzunluğunu kendisi bulur. - -b seçeneği yoksayıldı\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4051,17 +4059,17 @@ msgstr ""
 "Uyarı: -b (sektör uzunluğu ayarı) seçeneği tek aygıt ile kullanılmış "
 "olmalıydı\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 "%s üzerinde OSF/1 disk etiketi saptandı, disk etiketi kipine giriliyor.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Komut (yardım için m): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4070,16 +4078,16 @@ msgstr ""
 "\n"
 "Şu anki önyükleme dosyası: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Lütfen yeni açılış dosyasının ismini giriniz:"
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Açılış dosyası değiştirilmedi\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4402,9 +4410,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tKullanışsız bir önyükleme dosyası seçtiniz.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Boş olmayan bir disk bölümünün etiketini değiştirebilirsiniz!\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Sistem saati sadece root tarafından değiştirilebilir.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4420,7 +4428,7 @@ msgstr ""
 "\"SGI volume\" onunla çelişebilir. Bu disk bölümünü farklı\n"
 "oluşturmak istiyorsanız EVET yazın.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "EVET\n"
 
@@ -4627,7 +4635,7 @@ msgstr "Kullanılmamış boşluk - 0-%d sektörlerinde\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Kullanılmamış boşluk - %d-%d sektörlerinde\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4637,7 +4645,7 @@ msgstr ""
 "Tekrar denemeden önce bazılarını silmeniz ya da\n"
 "küçültmeniz gerek.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4646,12 +4654,12 @@ msgstr ""
 "Onbirinci disk bölümünün tüm diski kapsaması ve `SGI volume'\n"
 "türünde olması tavsiye edilir.\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4662,7 +4670,7 @@ msgstr ""
 "diğer disk bölümlerine de geçiyor. Girdiğiniz değer %d %s olarak\n"
 "değiştirildi.\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4671,7 +4679,7 @@ msgstr ""
 "SunOS/Solaris uyumluluğu sağlamak isterseniz, bu disk bölümünü 0 dan\n"
 "başlayan %u sektörlük tüm disk (5) olarak bırakmayı gözönüne alabilirsiniz\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4685,7 +4693,7 @@ msgstr ""
 "82 etiketli (Linux takas) olmasını istediğinizden eminseniz lütfen\n"
 "EVET yazınız: "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4705,7 +4713,7 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4718,28 +4726,28 @@ msgstr ""
 "Birim = %s  (%d * 512 bayt)\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Flama Başlangıç    Bitiş   Blok#   Kiml Sistem\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Almaşık silindirlerin sayısı"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Silindir başına fazladan sektörler"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Serpiştirme etkeni"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Devir sayısı (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Fiziksel silindirlerin sayısı"
 
@@ -5200,7 +5208,7 @@ msgstr "Disk %s: geometri alınamıyor\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Disk %s: boyu alınamıyor\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5211,22 +5219,22 @@ msgstr ""
 "gibi görünüyor. fdisk kullanmak anlamlı olmayacak.\n"
 "[Bunu mutlaka yapmak istiyorsanız --force seçeneğini kullanabilirsiniz]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Uyarı: HDIO_GETGEO %lu kafa bildiriyor\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Uyarı: HDIO_GETGEO %lu sektör bildiriyor\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Uyarı: BLKGETSIZE/HDIO_GETGEO %lu silindir bildiriyor\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5236,7 +5244,7 @@ msgstr ""
 "sayısına benzemiyor. Bu chs adresleme kullanılan yazılımlarla sorun "
 "çıkarır.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5245,7 +5253,7 @@ msgstr ""
 "\n"
 "Disk %s: %lu silindir, %lu kafa, %lu sektör/iz\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5253,7 +5261,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış kafa sayısı içeriyor: %lu (0-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5262,7 +5270,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış sektör sayısı içeriyor: %lu (1-%lu arasında "
 "olmalıydı)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5271,7 +5279,7 @@ msgstr ""
 "%s (%s disk bölümündeki) yanlış silindir sayısı içeriyor: %lu (0-%lu "
 "arasında olmalıydı)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5280,12 +5288,12 @@ msgstr ""
 "Kiml İsim\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Disk bölümleme tablosu yeniden okunuyor ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5295,26 +5303,26 @@ msgstr ""
 "Disk bölümleme tablosunun yeniden okunması başarılamadı\n"
 "mkfs kullanabilmek için sistemi yeniden başlatmalısınız.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "%s kapatılırken hata\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: böyle bir disk bölümü yok\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "biçem bilinmiyor - sektör sayısı kullanılıyor\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "desteklenmeyen biçem - %s kullanılıyor\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5323,14 +5331,14 @@ msgstr ""
 "birimler = %lu baytlık silindir, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 "                              silindir   blok\n"
 "   Aygıt Önykl Balangıç Bitiş sayısı   sayısı\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5339,14 +5347,14 @@ msgstr ""
 "birimler = 512 baytlık sektör, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 "    Aygıt Önyükl Başlangıç   Bitiş   sektör  Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5355,14 +5363,14 @@ msgstr ""
 "birim = 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyükl Başlangıç   Bitiş    blok    Kiml Sistem\n"
 "                                    sayısı\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5371,36 +5379,36 @@ msgstr ""
 "birimler = 1048576 baytlık mebibayt, 1024 baytlık blok, %d'den başlayarak\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 "   Aygıt Önyük Başl   Bitiş    MiB     blok    Kiml Sistem\n"
 "                                     sayısı\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbaşlangıç: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) "
 "bulundu\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tbitiş: (sld,kafa,sekt) (%ld,%ld,%ld) gerekirken (%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "disk bölümü disk sonundan sonra, %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Disk bölümü bulunamadı\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5411,51 +5419,41 @@ msgstr ""
 "(%ld/%ld/%ld yerine) yapılmış görünüyor.\n"
 "Bu listeleme bu geometriyle kabul ediliyor.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "disk bölümleme tablosu yok.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "tuhaf, sadece %d disk bölümü atanmış.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ama boş olarak imli değil\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve önyüklenebilir\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Uyarı: %s disk bölümü sıfır uzunlukta ve başlangıcı 0 da değil\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Uyarı: %s disk bölümü "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "%s disk bölümünde değil\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Uyarı: %s disk bölümü "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "ve %s birbirine girmiş\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Uyarı: %d disk bölümü boş\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5464,17 +5462,17 @@ msgstr ""
 "Uyarı: %s disk bölümleme tablosunun bir kısmını içerdiğinden (sektör %lu)\n"
 "dolduğunda onu bozacak\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Uyarı: %s disk bölümü 0. sektörde başlıyor\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Uyarı: %s disk bölümü disk sonunu aşıyor\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5482,17 +5480,17 @@ msgstr ""
 "Birincil disk bölümlerinden en çok biri ek disk bölümünde bulunabilir.\n"
 " (Şüphesiz Linux altında bu bir sorun değildir)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırından başlamıyor\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Uyarı: %s disk bölümü bir silindir sınırında bitmiyor\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5500,7 +5498,7 @@ msgstr ""
 "Uyarı: birden fazla disk bölümü önyükleme flaması içeriyor.\n"
 "Bu LILO için sorun yaratmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5508,7 +5506,7 @@ msgstr ""
 "Uyarı: birincil disk bölümlerinden sadece bir tanesi önyüklenebilir,\n"
 "LILO `bootable' flamasına aldırmaz.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5516,11 +5514,11 @@ msgstr ""
 "Uyarı hiçbir disk bölümü önyükleme bayrağı içermiyor\n"
 "Bu LILO için sorun oluşturmaz ama DOS MBR bu diski çalıştıramaz.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "başlangıç"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5528,23 +5526,23 @@ msgstr ""
 "%s: başlangıç: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "bitiş"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "%s: bitiş: (sld,kafa,sekt) sırasıyla (%ld,%ld,%ld) olmalıydı\n"
 "(%ld,%ld,%ld) bulundu\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "%s diskin sonunu aşarak %ld. silindirde bitiyor\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5553,7 +5551,7 @@ msgstr ""
 "Uyarı: ek disk bölümünün başlangıcı %ld den %ld ye kaydırıldı\n"
 "(Sadece liste uyumluluğu için. İçeriği değişmiyor.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5561,131 +5559,131 @@ msgstr ""
 "Uyarı: ek disk bölümü bir silindir sınırında başlamıyor.\n"
 "DOS ve Linux içerikleri farklı yorumlayacaktır.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "disk bölümü sayısı çok fazla - Bu sonuncusu (%d) disk bölümü\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "ağacında yok sayılsın mı?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "Disk yöneticisi saptadı - bulunan DM6 imzası\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "ile çalışılamıyor - bırakılıyor\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir ek disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "tuhaf..., sıfır uzunlukta bir BSD disk bölümü?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: disk bölümleme tablosu türü tanınmıyor\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n flaması verilmiş: Hiçbir şey değişmedi\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Eski sektörlere yazmada başarısızlık - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "uzun ve eksik girdi satırı - çıkılıyor\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "girdi hatası: %s alanından sonra bir `=' gerekli\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "girdi hatası: %c karakteri gereksiz (%s alanından sonra)\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "anlaşılmayan girdi: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "sayı çok büyük\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "sayıdan sonrasında süprüntü\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "disk bölümü betimleyici için yer yok\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "kuşatan ek disk bölümü kurgulanamıyor\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "girdi alanları çok fazla\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Daha fazla yer yok\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Kuraldışı tür\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Uyarı: belirtilen (%lu) uzunluk, izin verilen (%lu) uzunluktan fazla\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Uyarı: boş disk bölümü\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Uyarı: disk bölümü başlangıcı hatalı (en erken %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "anlaşılmayan önyükleme flaması; - ya da * seçiniz\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "kısmi sld,kafa,sekt özellikleri?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Ek disk bölümü gereken yerde değil\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "girdi hatalı\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "çok fazla disk bölümü var\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5698,103 +5696,184 @@ msgstr ""
 "Genellikle <başlangıç> ve <uzunluk> değerleri (ve tabii ki <türü>)\n"
 "belirtmek yeterlidir.\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+msgstr "Kullanımı:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "aygıt: /dev/hda veya /dev/sda gibi"
+msgid " %s [options] <device> [...]\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d disk bölümü:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "tehlikeli seçenekler:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [veya --show-pt-geometry]: bölümleme tablosundan alınan geometriyi "
+"basar"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x  --show-extended ek disk bölümlerini gösterir ve\n"
+"                        betimleyicileri için girdi bekler"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Kullanımı:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s aygıt\t\t aygıt üstündeki etkin disk bölümlerini gösterir\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s aygıt n1 n2 ... n1, n2 ile belirtilen disk bölümleri etkinleştirilir,\n"
 "                   diğerleri etkisizleştirilir\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 "%s -An aygıt\t n. disk bölümünü etkinleştirilir, diğerlerini "
 "etkisizleştirilir\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5803,62 +5882,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Tüm denetimleri kaldırmak için --force seçeneğini kullanın.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "Komut?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "toplam: %llu blok\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "Kullanımı: sfdisk --print-id aygıt disk-bölümü-numarası\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "kullanımı: sfdisk --change-id aygıt disk-bölümü-numarası kimlik\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "kullanımı: sfdisk --id aygıt disk-bölümü-numarası [kimlik]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "sadece bir aygıt belirtilebilir (-l ya da -s ile gerekir)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "%s oku-yaz açılamıyor\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "%s okumak için açılamıyor\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld silindir, %ld kafa, %ld sektör/iz\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "%s gibi bir boyut alınamıyor\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "hatalı etkin bayt: 0x80 yerine 0x%x\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5866,7 +5945,7 @@ msgstr ""
 "Bitti\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5875,35 +5954,35 @@ msgstr ""
 "%d etkin birincil disk bölümü var. Bu LILO için sorun olmamakla beraber\n"
 "DOS MBR sadece 1 etkin disk bölümü önyüklemesi yapabilir.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "%s disk bölümünün kimliği %x ve gizli değil\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Kimlik %lx hatalı\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Bu disk şu an kullanılıyor.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Ölümcül hata: %s bulunamıyor\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Uyarı: %s bir blok aygıtı değil\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Diskin kullanımda olup olmadığı denetleniyor...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5916,30 +5995,30 @@ msgstr ""
 "alanlarını swapoff ile kapatın. --no-reread bayrağını kullanarak\n"
 "yeniden okuma işlemini engelleyin.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Tüm denetimleri kaldırmak için --force seçeneğini kullanın.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "TAMAM\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Eski durum:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "%d. disk bölümü olmadığından geçilemiyor\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Yeni durum:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5947,21 +6026,21 @@ msgstr ""
 "Bu disk bölümlerinde hiç bir değişiklik yapılmadı.\n"
 "(Bunu gerçekten istiyorsanız --force seçeneğini kullanın.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Uygulanamıyor - siz de Hayır derdiniz, büyük ihtimalle\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bundan memnun musunuz? [ehs] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bunu diske yazmak ister misiniz? [ehs] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5970,16 +6049,16 @@ msgstr ""
 "\n"
 "sfdisk: girdi sonu eksik\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Çıkılıyor - Değişiklik yok\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Lütfen e, h, s harflerinden biri ile yanıtlayın\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5988,7 +6067,7 @@ msgstr ""
 "Yeni disk bölümleme tablosu başarıyla yazıldı\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6021,101 +6100,103 @@ msgstr "Diskler eşzamanlanıyor.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s başarıldı.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "erişim başarısız"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: %s açılamıyor: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: yok"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: sıkıştırma açılırken hata %d! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s bir lp aygıtı değil.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "%s için dosya sistemi denetimi şart.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6123,58 +6204,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s bir lp aygıtı değil.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "%s açılamadı\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s sistemden ayrıldı\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Kalan dosya istemleri ayrılıyor..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Kalan dosya istemleri ayrılıyor..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: bilinmeyen argüman: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6191,33 +6272,80 @@ msgstr "-l ya da --long için argüman olarak uzun seçenek verilmemiş"
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s ya da --shell seçenekleri ile belirtilen kabuk bilinmiyor"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+"       getopt [seçenekler] -o|--options seçenek-dizgesi [seçenekler] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative             tek - ile başlayan uzun seçeneklere izin\n"
+"                                verilir\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                    Bu yardım iletisini gösterir\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=uzunSeçnk   tanınacak uzun seçenek belirtilir\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=uygismi            Hatalar bu isim altında raporlanır\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=sçnkdizgesi     Tanınacak kısa seçenekler belirtilir\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                   getopt(3)'un ürettiği hatalar gösterilmez\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Normalde verilen çıktı verilmez\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=kabukTürü         Kullanılacak kabuk türü belirtilir\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                    getopt(1) sürümü için test\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                  Çıktı tırnak içine alınmaz\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                 Sürüm bilgilerini gösterir\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "seçenek-dizgesi verilmemiş"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "iç hata, yazara bildirin."
 
@@ -6675,92 +6803,110 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Çekirdekte dönemsellik değeri ayarlanamıyor.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d disk bölümü:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                Alpha'nızın hwclock türü belirtilir\n"
 "               (hwclock(8) man sayfasına bakınız)\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "Sistem saati ayarlanamıyor.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: açılamıyor: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s seçeneği argüman almaz.  %d verildi.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6769,7 +6915,7 @@ msgstr ""
 "Çok sayıda işlev belirttiniz.\n"
 "Bir defada sadece bir işlev uygulanabilir.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6778,7 +6924,7 @@ msgstr ""
 "%s: --utc ve --localtime seçenekleri birbiriyle çelişiyor.  İkisi de "
 "belirtilmiş.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6787,7 +6933,7 @@ msgstr ""
 "%s:  --adjust ve --noadjfile seçenekleri birbiriyle çelişir.\n"
 "Siz ikisini de belirtmişsiniz.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6796,27 +6942,27 @@ msgstr ""
 "%s:  --adjust ve --noadjfile seçenekleri birbiriyle çelişir.\n"
 "Siz ikisini de belirtmişsiniz.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s: --noadjfile ile ya --utc ya da --localtime belirtilmelidir\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Zaman ayarlama kullanımdışı.  Saat ayarlanamaz.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Donanım saati sadece root tarafından değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Sistem saati sadece root tarafından değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6824,12 +6970,12 @@ msgstr ""
 "Çekirdekteki Donanım Saati dönemsellik değeri sadece root tarafından "
 "değiştirilebilir.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "Bilinen her hangi bir yöntemle Donanım Saatine erişilemiyor.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7010,7 +7156,7 @@ msgid "failed to read mtab"
 msgstr "%s durum bilgileri alınamıyor"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "Tampon ayrılamadı.\n"
@@ -7052,72 +7198,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: bağlanamadı"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: açılamıyor: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "Tampon ayrılamadı.\n"
@@ -7205,7 +7391,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: PAM hatası, çıkılıyor: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Parola: "
 
@@ -7654,47 +7840,48 @@ msgstr "HADDİNDEN FAZLA boş giriş"
 msgid "too many bare linefeeds."
 msgstr "çok fazla boş geçildi.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Giriş %d saniye sonra zaman aşımına uğradı\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Son giriş: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "sularında %.*s makinasına yapıldı\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "sularında %.*s konsoluna yapıldı\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "%s açılamadı"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "%s MAKİNASINDAN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "%s ÜZERİNDEN %s GİRİŞİ BAŞARISIZ"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%3$s %2$s MAKİNASINDAN %1$d KERE GİREMEDİ"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%3$s %2$s ÜZERİNDEN %1$d KERE GİREMEDİ"
@@ -7724,7 +7911,7 @@ msgstr "mount: erişim engellendi"
 msgid "setuid failed"
 msgstr "setuid() başarısız"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "çalıştırma başarısız\n"
@@ -7770,8 +7957,8 @@ msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 "%s: %s için bağ kaldırılamıyor: %s (değişiklikleriniz hala %s içinde)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "ast süreç oluşturulamadı\n"
@@ -7824,24 +8011,21 @@ msgstr "yıl değeri kuraldışı: 1-9999 arasında olmalı"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "kullanımı: cal [-13smjyV] [[ay] yıl]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7953,32 +8137,32 @@ msgstr " Silinsin mi?"
 msgid "failed to add line to output"
 msgstr "Tampon ayrılamadı.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "erişim hatası"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "Tampon ayrılamadı.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: %s okunamıyor.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "Tampon ayrılamadı.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "bellek ayrılamadı"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7989,91 +8173,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Mümkün komutlar:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "%s dizini yok!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: açılamıyor: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "Tampon ayrılamadı.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "Tampon ayrılamadı.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "Tampon ayrılamadı.\n"
@@ -8098,12 +8307,12 @@ msgstr "%s: \"%s\" süreci bulunamıyor\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: %s sinyali bilinmiyor; geçerli sinyaller:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "kullanımı: %s [ -s sinyal | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ sinyal ]\n"
@@ -8123,84 +8332,83 @@ msgstr "BlokUzunl: %d\n"
 msgid "connect %s"
 msgstr "nfs bağlantısı"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs soketi"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs bağlantısı"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Sonraki dosya: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "`%s' `%s' aralığının dışında\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: bilinmeyen yetenek ismi: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: bilinmeyen öncelik ismi: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8338,7 +8546,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: açılamıyor: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8356,12 +8564,13 @@ msgstr "%s: açılamıyor: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: açılamıyor: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8369,7 +8578,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8392,40 +8601,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "%s açılamadı\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "%d bayt %s dosyasından alındı\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "çalıştırma başarısız\n"
@@ -8445,24 +8654,12 @@ msgstr "%s aygıtının durum bilgisi alınamıyor"
 msgid "%s - No such file or directory\n"
 msgstr "kök düğümü bir dizin değil"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "kullanımı: namei [-mx] dosyaYolu [dosyaYolu ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d disk bölümü:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8474,19 +8671,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date ile verilen argüman çok uzun\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8496,169 +8692,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: %s  %s olarak değiştirilemedi: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: -l argümanı %s hatalı.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Kaydet"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "%c okundu\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: açılamıyor: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "%s durum bilgileri alınamıyor"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "%s açılamıyor: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "%s açılamıyor: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "%s okunurken hata\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "kimlik geçersiz"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "kimlik geçersiz"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "Numara geçersiz: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "%s için kip değiştirilirken hata: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8666,29 +8860,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8724,43 +8917,44 @@ msgid "%s: write failed"
 msgstr "openpty başarısız\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "bayt"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8855,63 +9049,63 @@ msgstr "%s için kip değiştirilirken hata: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "%s %s olarak değiştirilemiyor: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: \"%s\" yok.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: %s aygıtı hakkında bilgi alınamıyor: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", başl %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", boysınırı %lld"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", %s şifreleme türü (%d) bilinmiyor"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", başl %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", şifreleme türü %d bilinmiyor\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: %s aygıtı hakkında bilgi alınamıyor: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: /dev/loop# için izinler yetersiz"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: hiç serbest loop aygıtı yok"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8921,56 +9115,54 @@ msgstr ""
 "       bilgiye sahip değil. (`modprobe loop' deneyin, sonuç alamazsanız\n"
 "       çekirdeği yeniden derleyin.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Tampon büyütülürken bellek yetmedi.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Sektör %d zaten kullanımda\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s yazma korumalı, salt-okunur olarak bağlanıyor"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Bellek içinde kilitlenemedi, çıkılıyor.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): başarılı\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): başarılı\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: %s aygıtı silinemiyor: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "Bu mount loop desteği olmaksızın derlenmiş. Lütfen yeniden derleyin.\n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8978,7 +9170,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "kullanımı:\n"
 "  %s loop_aygıtı                                          # bilgi verilir\n"
@@ -8987,48 +9179,45 @@ msgstr ""
 "kullanılmamışlar\n"
 "  %s [ -e şifreleme ] [ -o konum ] {-f|loop_aygıtı} dosya # ayarlama\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: %s aygıtı açılamıyor: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: aygıt meşgul"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Derleme sırasında loop desteği verilmemiş. Lütfen yeniden derleyin.\n"
@@ -9584,163 +9773,166 @@ msgstr "xstrndup çağrısında yazılım hatası"
 msgid "not enough memory"
 msgstr "yeterli bellek yok"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: %s doyasında beklenmedik dosya sonu\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "çalıştırma başarısız\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "setuid() başarısız"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "%s açılamadı"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "İsim"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: uyarı: %s güvencesiz izinler (%04o) içeriyor, %04o önerilir\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: %s atlanıyor - bazı delikler içeriyor gibi görünüyor.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s %s üzerinde\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: %s için aygıt ismi bulunamıyor\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "root değil.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "erişim başarısız"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10029,7 +10221,7 @@ msgstr "Seçilen disk bölümü %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10089,19 +10281,13 @@ msgstr "   p   BSD disk bölümleme tablosunu gösterir"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "%s diski geçerli bir disk bölümleme tablosu içermiyor\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10112,47 +10298,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Mümkün komutlar:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: açılamıyor: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "Tampon ayrılamadı.\n"
@@ -10280,7 +10465,7 @@ msgstr "%s disk bölümüne yazarken hata oluştu\n"
 msgid "failed to set pid %d's policy"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "ioctl() %s den zamanı okuyamadı"
@@ -10553,7 +10738,7 @@ msgstr "%s: %ld eşik ve %ld zaman aşımı öntanımlı\n"
 msgid "Can't set signal handler"
 msgstr "sinyal yakalayıcı ayarlanamıyor"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday başarısız"
 
@@ -10562,7 +10747,7 @@ msgstr "gettimeofday başarısız"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "%s üzerinde CYGETMON uygulanamıyor: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10570,12 +10755,12 @@ msgstr ""
 "%s: %lu kesme, %lu/%lu karkt; fifo: %lu eşik, %lu zam.aş, ençok %lu, şuan "
 "%lu\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f kesme/s; %f kayıt, %f gönderi (karkt/s)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10583,7 +10768,7 @@ msgstr ""
 "%s: %lu kesme, %lu karakter; fifo: eşik %lu, zaman aşımı %lu, en çok %lu, "
 "şimdiki %lu\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f kesme/sec; %f kayıt (karkt/s)\n"
@@ -10675,124 +10860,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: açılamıyor: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Bilinmeyen komut: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: açılamıyor: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "%s dizini yok!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync hata verdi"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Sonraki dosya: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: açılamıyor: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "Komut?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "fsync hata verdi"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10800,43 +10968,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Çok fazla argüman belirtildi.\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Ayar değeri geçersiz: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "--date seçeneği belirtilmemiş.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "azami bölüt sayısı = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "openpty başarısız\n"
@@ -10844,100 +11012,100 @@ msgstr "openpty başarısız\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s bir argümanla kullanılır\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: %s açılamıyor: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "Numara geçersiz: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "ast süreç oluşturulamadı\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "--date seçeneği belirtilmemiş.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "--date seçeneği belirtilmemiş.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "erişim başarısız"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "kök düğümü bir dizin değil"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "openpty başarısız\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "openpty başarısız\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10946,101 +11114,92 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: açılamıyor: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: açılamıyor: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "ioctl() %s den zamanı okuyamadı"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "--date seçeneği belirtilmemiş.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "kök düğümü bir dizin değil"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "openpty başarısız\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Paylaşımlı bellek Bölüt shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "İleti Kuyruğu iltkiml=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "ayrılmış semafor sayısı = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11537,8 +11696,8 @@ msgstr ""
 "Paylaşımlı bellek Bölüt shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "kullkiml=%d\tgkiml=%d\tckullkiml=%d\tcgkiml=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11547,8 +11706,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "kip=%#o\terişim_izni=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bayt=%ld\tlpid=%d\tcpid=%d\tekSayısı=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11581,8 +11740,8 @@ msgstr ""
 "İleti Kuyruğu iltkiml=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "kullkiml=%d\tgkiml=%d\tckullkiml=%d\tcgkiml=%d\tkip=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11615,8 +11774,8 @@ msgstr ""
 "Semafor Dizisi semkiml=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "kullkiml=%d\t gkiml=%d\t ckullkiml=%d\t cgkiml=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11664,71 +11823,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%2$s deki %1$s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "kimlik geçersiz"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "kimlik geçersiz: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s bir blok-özel aygıt değil"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "%s uzunluğu alınamıyor"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Disk sürücü üzerinde arama yapılamıyor"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "%s uzunluğu alınamıyor"
@@ -11885,48 +12042,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "kök düğümü bir dizin değil"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s bağlı.\t"
@@ -11962,55 +12114,50 @@ msgstr ""
 "\t -n                 bayt sıralamasının saptanmasını önler\n"
 "\t -V                 sürüm bilgilerini gösterir ve çıkar\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: %s yazılırken hata: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Örnekleme_adımı: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): eşlem satırı yanlış\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: \"_stext\" %s içinde bulunamıyor\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: profil adresi kapsamdışı. Eşlem dosyası yanlış olabilir mi?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "toplam"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12019,240 +12166,231 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%2$s deki %1$s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Bilinmeyen komut: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "zaman aşımı değeri hatalı: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "kullanıcı"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: eski öncelik %d, yeni öncelik %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "gettimeofday başarısız"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "ayrılmış semafor sayısı = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr ""
 "\n"
 "Dosya kapatılırken hata\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "erişim başarısız"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "ayrılmış semafor sayısı = %d\n"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "gettimeofday başarısız"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: disk bölümleme tablosu türü tanınmıyor\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: açılamıyor: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: açılamıyor: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "%s kullanarak.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "%s kullanarak.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s bir lp aygıtı değil.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s@%s den ileti var (%s üzerinden, şu an %s) ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s@%s den ileti var (%s üzerinden, şu an %s) ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "ioctl() %s den zamanı okuyamadı"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Sonraki dosya: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12303,17 +12441,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `getopt --help' yazınız.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: disk bölümleme tablosu türü tanınmıyor\n"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "Çok fazla argüman belirtildi.\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "%s disk bölümüne yazarken hata oluştu\n"
@@ -12399,173 +12537,171 @@ msgstr "%s IRQ %d kullanıyor\n"
 msgid "%s using polling\n"
 msgstr "%s sorgulama kullanıyor\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "kullanımı: %s program [arg ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "erişim başarısız"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: %s çalıştırılamıyor: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s için kip değiştirilirken hata: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: \"%s\" süreci bulunamıyor\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: %s çalıştırılamıyor: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "Tampon ayrılamadı.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "zaman aşımı değeri hatalı: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Çok fazla argüman belirtildi.\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "Tampon ayrılamadı.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "hatalı hız: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "almaşık hız çok yüksek"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: standart girdi olarak açılamıyor: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: bir karakter aygıtı değil"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: oku/yaz için açık değil"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: çoğaltma sorunu: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "türü: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: okunan: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: girdi geçersiz"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12577,69 +12713,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "kullanıcı"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "kullanıcı"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "erişim başarısız"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Sonraki dosya: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "Başkaları uçbirime yazabilir.\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "Başkaları uçbirime yazamaz.\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "ayrılmış semafor sayısı = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "kimlik geçersiz: %s\n"
@@ -12655,52 +12785,46 @@ msgstr ""
 "Gerçekten kullanmak istiyorsanız `%s [seçenekler] %s' ile kullanın.\n"
 "Betik başlatılmadı.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "'%s' dosyası açılamıyor"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Betik başlatıldı, dosyası %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "%s de betik başlatıldı"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: %s için aygıt ismi bulunamıyor\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12709,80 +12833,77 @@ msgstr ""
 "\n"
 "%s üzerinde betik tamamlandı"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Betik tamamlandı, dosyası %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty başarısız\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "pty sayısı yetersiz\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "%s açılamadı"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "ioctl() %s den zamanı okuyamadı"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "azami bölüt sayısı = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "'%s' dosyası açılamıyor"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "ioctl() %s den zamanı okuyamadı"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: %s doyasında beklenmedik dosya sonu\n"
@@ -12793,111 +12914,108 @@ msgid "Argument error."
 msgstr "%s: Argüman hatası, kullanımı\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "Kullanıcı bilgileri değiştirildi.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "ast süreç oluşturulamıyor"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "ast süreç oluşturulamıyor"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "%s açılamıyor\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "ekonomi kipi denetim dışı\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "%s aygıtı yazılmak üzere açılamıyor\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl hatası: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Ekran dökümü yazılırken hata\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "%s açılamadı\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM atanmamış.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: bilinmeyen sinyal: %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12925,142 +13043,144 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "kimlik geçersiz"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "zaman aşımı değeri hatalı: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: geçici dosya açılamıyor.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: hız ayarlanamıyor: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Diskin toplam alanı hesaplanamıyor"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "%s@%s den Uyarı"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: %s okunamayacak - stdG kullanın.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "erişim başarısız"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Sonraki dosya: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "kullanımı: namei [-mx] dosyaYolu [dosyaYolu ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: kullandığınız tty ismi bulunamıyor\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: yazma izinleriniz kapalı.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s ile %s üzerinde giriş yapılmamış.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s iletileri %s üzerinde kapalı\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s sistemde değil\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: iletiler %s için kapalı\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s birden fazla giriş yapmış; %s'e yazıyor\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Girdi satırı çok uzun.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "%s@%s den ileti var (%s olarak, %s üzerinden, şu an %s) ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "%s@%s den ileti var (%s üzerinden, şu an %s) ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "bellek ayrılamadı"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13239,7 +13359,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13442,7 +13562,7 @@ msgstr ""
 "\n"
 "Kalıp bulunamadı\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Kalıp bulunamadı"
 
@@ -13507,7 +13627,7 @@ msgstr "hexdump: biçem hatalı {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: dönüşüm karakteri %%%s hatalı.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13535,7 +13655,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13543,81 +13663,81 @@ msgstr ""
 "%s: Kullanımı: %s [-number] [-p dizge] [-cefnrs] [+satır] [+/kalıp/] "
 "[dosyalar]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: seçenek bir argümanla kullanılır -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: kuraldışı seçenek -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...ileri atlanıyor\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...geri atlanıyor\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Sonrasında dosya yok"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Öncesinde dosya yok"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: %s dosyasından okuma hatası\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: %s doyasında beklenmedik dosya sonu\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: %s doyasında bilinmeyen hata\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: geçici dosya oluşturulamıyor.\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "RE hatası:"
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(DosyaSonu)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Arama dizgesi yok"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Açılamıyor"
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "kaydedildi"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": rflag kipinde ! komutu kullanılmaz.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "Alt süreç oluşturulamadı, daha sonra tekrar deneyin\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Sonraki dosya: "
 
@@ -13685,8 +13805,8 @@ msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13702,39 +13822,105 @@ msgstr "%s: açılamıyor: %s\n"
 msgid "no input file specified"
 msgstr "--date seçeneği belirtilmemiş.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "terminfo okunmaya çalışılıyor"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Girdideki önceleme dizgesi bilinmiyor: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Girdi satırı çok uzun.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Kullanımı:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Dosya kapatılırken hata\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Boş olmayan bir disk bölümünün etiketini değiştirebilirsiniz!\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Uyarı: %s disk bölümü "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Uyarı: %s disk bölümü "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "ve %s birbirine girmiş\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "aygıt: /dev/hda veya /dev/sda gibi"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "bayt"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Kullanımı: %s [seçenekler] aygıt ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13883,27 +14069,10 @@ msgstr "Girdi satırı çok uzun.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -?  --help          bu yardım iletisini gösterir ve çıkar"
 
-#~ msgid "dangerous options:"
-#~ msgstr "tehlikeli seçenekler:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g  --show-geometry çekirdeğin geometri bilgisini gösterir"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [veya --show-pt-geometry]: bölümleme tablosundan alınan geometriyi "
-#~ "basar"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x  --show-extended ek disk bölümlerini gösterir ve\n"
-#~ "                        betimleyicileri için girdi bekler"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -13963,57 +14132,9 @@ msgstr "Girdi satırı çok uzun.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [seçenekler] [--] seçenek-dizgesi parametreler\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [seçenekler] -o|--options seçenek-dizgesi [seçenekler] "
-#~ "[--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              parametreler\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative             tek - ile başlayan uzun seçeneklere izin\n"
-#~ "                                verilir\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                    Bu yardım iletisini gösterir\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=uzunSeçnk   tanınacak uzun seçenek belirtilir\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=uygismi            Hatalar bu isim altında raporlanır\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr ""
-#~ "  -o, --options=sçnkdizgesi     Tanınacak kısa seçenekler belirtilir\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                   getopt(3)'un ürettiği hatalar "
-#~ "gösterilmez\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Normalde verilen çıktı verilmez\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=kabukTürü         Kullanılacak kabuk türü belirtilir\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                    getopt(1) sürümü için test\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                  Çıktı tırnak içine alınmaz\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                 Sürüm bilgilerini gösterir\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (gelişmiş) 1.1.4\n"
 
diff --git a/po/uk.po b/po/uk.po
index 5a2bbf5af..fd3e46afb 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux 2.13-pre7\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2006-04-06 10:45+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -108,29 +108,29 @@ msgstr "перечитати таблицю розділів"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "отримати розмір у байтах"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "не вдається відкрити %s"
@@ -209,7 +209,7 @@ msgid "Verifying ... "
 msgstr "Перевірка ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "не вдається відкрити файл '%s'"
@@ -249,15 +249,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -270,7 +270,7 @@ msgstr "%s з %s\n"
 msgid "cannot stat file %s"
 msgstr "не вдається отримати інформацію про %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -319,8 +319,8 @@ msgid "stat failed: %s"
 msgstr "(Наступний файл: %s)"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "помилка openpty\n"
@@ -551,55 +551,55 @@ msgstr "%s: неправильний cramfs - неправильний зсув
 msgid "compiled without -x support"
 msgstr "%s: зібрано без підтримки -x\n"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: Гаразд\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Використання: %s [-larvsmf] /dev/назва\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s підключено.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Ви дійсно бажаєте продовжити"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "перевірку перервано.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "nr зони < FIRSTZONE у файлі `%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "nr зони >= ZONES у файлі `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Видалити блок"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Помилка читання: помилка при позиціюванні на блок у файлі '%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Помилка читання: неправильний блок у файлі '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -608,298 +608,298 @@ msgstr ""
 "Внутрішня помилка: спроба запису у пошкоджений блок\n"
 "Операція запису проігнорована\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "помилка при позиціюванні у функції write_block"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Помилка запису: пошкоджений блок у файлі '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "помилка при позиціюванні у функції write_super_block"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "помилка запису суперблоку"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Не вдається записати мапу вузлів"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Не вдається записати мапу зон"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Не вдається записати вузли"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "помилка при встановленні позиції"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "не вдається виділити буфери для мап"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "не вдається прочитати суперблок"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "неправильна сигнатура суперблока"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Підтримуються лише 1k блоки/зону"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "неправильне s_imap_blocks поле у суперблоці"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "неправильне s_zmap_blocks поле у суперблоці"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Не вдається виділити буфер для мапи вузлів"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 #, fuzzy
 msgid "Unable to allocate buffer for zone map"
 msgstr "Не вдається виділити буфер для мапи вузлів"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Не вдається виділити буфер для вузлів"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Не вдається виділити буфер для лічильника вузлів"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Не вдається виділити буфер для лічильника зон"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Не вдається прочитати мапу вузлів"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Не вдається прочитати мапу зон"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Не вдається прочитати вузли"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Попередження: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld вузлів\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld блоків\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Перша зона даних=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Розмір зони=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Макс.розмір=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Стан файлової системи=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "довж.назви=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Вузол %d позначений як вільний, але використовується у '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Позначити як використовуваний"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Файл `%s' має права доступу %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Попередження: значення лічильника вузлів надто велике.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "кореневий вузол не є каталогом"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Блок вже використовується раніше. Тепер у файлі `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Очистити"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Блок %d з файлу `%s' позначений вільним."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Виправити"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Каталог '%s' містить неправильну кількість вузлів для файлу '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Видалити"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: неправильний каталог: елемент '.' не перший\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: неправильний каталог: елемент '..' не другий\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "внутрішня помилка"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: неправильний каталог: розмір < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "помилка при позиціюванні у функції bad_zone"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Права доступу вузла %d не очищені."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 "Вузол %d не використовується, але позначений використовуваним у бітовій мапі."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Вузол %d використовується, але позначений вільним у бітовій мапі."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Встановити"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Вузол %d (права = %07o), i_nlinks=%d, лічильник=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Встановити i_nlinks у значення лічильника"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr ""
 "Зона %d: позначена використовуваною, але вона не використовується файлами."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Зняти позначення"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Зона %d: використовується, лічильник=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Зона %d: не використовується, лічильник=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "неправильний розмір вузла"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "неправильний номер вузла версії 2"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "для інтерактивного відновлення необхідний термінал"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, fuzzy, c-format
 msgid "unable to open '%s': %s"
 msgstr "не вдається відкрити '%s'"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s - чистий, перевірка не виконуватиметься.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Примусова перевірка файлової системи на %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Файлова система на %s пошкоджена, потрібна перевірка.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -908,12 +908,12 @@ msgstr ""
 "\n"
 "%6ld використаних вузлів (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld використаних зон (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -936,7 +936,7 @@ msgstr ""
 "------\n"
 "%6d файлів\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1060,7 +1060,7 @@ msgstr "надто багато вузлів - максимум 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "не вистачає простору, потрібно принаймні %lu блоків"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Пристрій: %s\n"
@@ -1229,10 +1229,8 @@ msgstr "%6.2f%% (%+d байтів)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Помилка закривання файлу\n"
+msgid "cannot close file %s"
+msgstr "не вдається відкрити файл '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1339,89 +1337,99 @@ msgstr ""
 "УВАГА: номери пристроїв обрізані до %u біт. Це майже завжди означає\n"
 "що деякі файли пристроїв будуть неправильними.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr ""
 "Використання: %s [-c | -l назва_файлу] [-nXX] [-iXX] /dev/назва [блоки]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s підключений; тут не можна створювати файлову систему!"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "помилка позиціювання на завантажувальний блок у функції write_tables"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "не вдається очистити завантажувальний сектор"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "помилка позиціювання у функції write_tables"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "помилка запису суперблоку"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "не вдається записати мапу вузлів"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "не вдається записати мапу зон"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "не вдається записати вузли"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "помилка при позиціюванні у функції write_block"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "помилка запису у функції write_block"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "надто багато пошкоджених блоків"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "недостатньо непошкоджених блоків"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "не вдається виділити буфери для мап"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "не вдається виділити буфери для мап"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "не вдається виділити буфер для вузлів"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld вузлів\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld блоків\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1430,97 +1438,97 @@ msgstr ""
 "Макс.розмір=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "помилка позиціювання при перевірці блоків"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Незрозуміле значення у функції do_check: можливо помилка\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "помилка позиціювання у функції check_blocks"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "неправильні блоки перед областю даних: не вдається створити ФС"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d пошкоджених блоків\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "один пошкоджений блок\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "не вдається відкрити файл пошкоджених блоків"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "не вдається прочитати дисковий пристрій"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "неправильний розмір вузла"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol помилка: не вказано кількість блоків"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "помилка при встановленні позиції"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "помилка openpty\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "umount: %s: пристрій зайнятий"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, fuzzy, c-format
 msgid "cannot determine size of %s"
 msgstr "не вдається отримати розмір %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "файлова система не буде створена на '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "Кількість секторів"
@@ -1860,7 +1868,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "помилка позиціювання у функції write_tables"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2202,7 +2210,7 @@ msgid "   Logical"
 msgstr "   Логічний "
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Невідомий"
 
@@ -2863,12 +2871,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Команда режиму BSD етикетки диску (m - довідка): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "Перший %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "Останній %s або +size або +sizeM або +sizeK"
@@ -3014,7 +3022,7 @@ msgid "tracks/cylinder"
 msgstr "доріжок/циліндр"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "циліндри"
 
@@ -3081,12 +3089,12 @@ msgstr "Вже створено максимальну кількість роз
 msgid "This partition already exists.\n"
 msgstr "Цей розділ вже існує.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Попередження: надто багато розділів (%d, максимум - %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3290,7 +3298,7 @@ msgstr "Необхідно встановити"
 msgid "heads"
 msgstr "головки"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "сектори"
 
@@ -3721,7 +3729,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s Завант  Початок     Кінець     Блоків  Ід  Система\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Пристрій"
 
@@ -3806,7 +3814,7 @@ msgstr "Загальна кількість розподілених секто�
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld нерозподілених секторів\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "Розділ %d вже визначений.  Видаліть його перед повторним додаванням.\n"
@@ -3962,37 +3970,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Синхронізація дисків.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Розділ %d не має області даних\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Новий початок даних"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Команди експертного режиму(m - довідка): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Кількість циліндрів"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Кількість головок"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Кількість секторів"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Попередження: встановлюється зсув сектору для сумісності з DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4001,33 +4009,33 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Диск %s не містить правильної таблиці розділів\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "не вдається відкрити %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: невідома команда\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 "Це ядро визначає розмір сектору саме, тому -b параметри проігноровано\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4036,16 +4044,16 @@ msgstr ""
 "Попередження: з вказаним пристроєм повинен використовуватись параметр -b "
 "(встановити розмір сектора)\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Знайдено OSF/1 етикетку диску на %s, перехід у режим етикетки диску.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Команда (m - довідка): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4054,16 +4062,16 @@ msgstr ""
 "\n"
 "Поточний файл завантаження: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Введіть назву нового файлу завантаження: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Файл завантаження не змінено\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4385,9 +4393,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tВи вибрали незвичайну назву файлу завантаження.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Пробачте, Ви можете змінити тег не-порожніх розділів.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "Змінювати системний час може лише адміністратор.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4403,7 +4411,7 @@ msgstr ""
 "Не дотримуватись цього можуть лише \"SGI volume\" на весь диск.\n"
 "Введіть YES, якщо ви впевнені, що хочете позначити цей розділ по-іншому.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4604,7 +4612,7 @@ msgstr "Невикористаний простір - сектори 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Невикористаний простір - сектори %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4613,7 +4621,7 @@ msgstr ""
 "Інші розділи вже займають весь диск.\n"
 "Видаліть частину/зменшіть їх розмір перед спробою.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, fuzzy, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4622,12 +4630,12 @@ msgstr ""
 "Наполегливо рекомендується, щоб одинадцятий розділ\n"
 "займав увесь диск та мав тип `SGI volume'\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4638,7 +4646,7 @@ msgstr ""
 "%d %s перекриває деякий інший розділ. Ваш елемент було змінено\n"
 "на %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4648,7 +4656,7 @@ msgstr ""
 "як\n"
 "весь диск(5), починаючи з 0, розміром %u секторів\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4662,7 +4670,7 @@ msgstr ""
 "Введіть YES, якщо ви справді впевнені, що бажаєте позначити розділ\n"
 "типом 82 (Linux swap): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4682,7 +4690,7 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4695,28 +4703,28 @@ msgstr ""
 "Одиниці виміру = %s з %d * 512 байт\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Ознака Початок    Кінець     Блоки   Ід  Система\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Кількість запасних циліндрів"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Додаткових секторів у циліндрі"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Фактор чергування"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Швидкість обертання (об/хв)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Кількість фізичних циліндрів"
 
@@ -5176,7 +5184,7 @@ msgstr "Диск %s: не вдається отримати геометрію\n
 msgid "Disk %s: cannot get size\n"
 msgstr "Диск %s: не вдається отримати розмір\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5187,22 +5195,22 @@ msgstr ""
 "Використання fdisk для нього мабуть безглуздо..\n"
 "[Використовуйте параметр --force, якщо ви дійсно цього бажаєте]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Попередження: HDIO_GETGEO вказує, що є %lu головок\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Попередження: HDIO_GETGEO вказує, що є %lu секторів\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Попередження: BLKGETSIZE/HDIO_GETGEO вказує, що є %lu циліндрів\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5212,7 +5220,7 @@ msgstr ""
 "63\n"
 "Це буде спричиняти проблеми з усім ПЗ, яке використовує C/H/S адресацію.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5221,7 +5229,7 @@ msgstr ""
 "\n"
 "Диск %s: %lu циліндрів, %lu головок, %lu секторів/доріжку\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5229,7 +5237,7 @@ msgstr ""
 "%s з розділу %s має неможливе значення кількості головок: %lu (мусить бути 0-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5238,7 +5246,7 @@ msgstr ""
 "%s з розділу %s має неможливе значення кількості секторів: %lu (мусить бути "
 "1-%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5247,7 +5255,7 @@ msgstr ""
 "%s з розділу %s має неможливе значення кількості циліндрів: %lu (мусить бути "
 "0-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5256,12 +5264,12 @@ msgstr ""
 "Ідентиф. Назва\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Перечитується таблиця розділів ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 #, fuzzy
 msgid ""
 "The command to re-read the partition table failed.\n"
@@ -5271,26 +5279,26 @@ msgstr ""
 "Команда перечитування таблиці розділів завершилась аварійно\n"
 "Перезавантажте систему перед використанням mkfs\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Помилка закривання %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: немає такого розділу\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "нерозпізнаний формат - використовуються сектори\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "нереалізований формат - використовується %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5299,12 +5307,12 @@ msgstr ""
 "Одиниці виміру = циліндри по %lu байт, блоки по 1024 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "Пристрій Завант Початок Кінець Циліндрів Блоків   Ід  Система\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5313,12 +5321,12 @@ msgstr ""
 "Одиниці виміру = сектори по 512 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "Пристрій Завант Початок    Кінець   Секторів  Ід  Система\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5327,12 +5335,12 @@ msgstr ""
 "Одиниця виміру = блоки по 1024 байт, рахуючи від %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "Пристрій Завант Початок   Кінець     Блоків   Ід  Система\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5342,32 +5350,32 @@ msgstr ""
 "%d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "  Пристрій Завант Початок Кінець Мб     Блоків   Ід  Система\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "\t\tпочаток: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tкінець: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "розділ закінчується на циліндрі  %ld, за межею обсягу диску\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Не знайдено розділів\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5378,51 +5386,41 @@ msgstr ""
 "  для C/H/S=*/%ld/%ld (замість %ld/%ld/%ld).\n"
 "Для цього виводу вважатиметься ця геометрія.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "відсутня таблиця розділів.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "дивно, визначено лише %d розділів.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Попередження: розділ %s має розмір 0, але не позначений порожнім\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Попередження: розділ %s має розмір 0 та позначений завантажувальним\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Попередження: розділ %s має розмір 0 але починається не з нуля\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Попередження: розділ %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "не розташований у розділі %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Попередження: розділи %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "та %s перекриваються\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Попередження: розділ %d порожній\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5431,17 +5429,17 @@ msgstr ""
 "Попередження: розділ %s містить частину таблиці розділів (сектор %lu),\n"
 "та її буде знищено при його заповненні\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Попередження: розділ %s починається з сектор 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Попередження: розділ %s поширюється за межі диску\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5449,17 +5447,17 @@ msgstr ""
 "Крім первинних розділів, принаймні один може бути розширеним\n"
 " (хоча це не проблема для Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Попередження: розділ %s починається не з межі циліндра\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Попередження: розділ %s не закінчується на межі циліндра\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5469,7 +5467,7 @@ msgstr ""
 "Це не має значення для Lilo, але DOS MBR не зможе завантажуватись з цього "
 "диску.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5477,7 +5475,7 @@ msgstr ""
 "Попередження: зазвичай можна завантажуватись лише з первинних розділів\n"
 "LILO не звертає уваги на ознаку `завантажувальний'.\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5486,11 +5484,11 @@ msgstr ""
 "(активним)\n"
 "Це несуттєво для LILO, але DOS MBR не зможе завантажуватись з цього диску.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "початок"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
@@ -5498,22 +5496,22 @@ msgstr ""
 "розділ %s: початок: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,"
 "%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "кінець"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "розділ %s: кінець: (c,h,s) очікувалось (%ld,%ld,%ld) знайдено (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "розділ %s закінчується на циліндрі %ld, за межами диску\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5522,7 +5520,7 @@ msgstr ""
 "Попередження: зміщено початок розширеного розділу з %ld на %ld\n"
 "(Лише для відображення. Не змінюйте вміст.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5530,132 +5528,132 @@ msgstr ""
 "Попередження: розширений розділ не починаєтеся на межі циліндра.\n"
 "DOS та Linux будуть інтерпретувати вміст по-різному.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "надто багато розділів - ігнорується попередній nr (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "дерево розділів?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "знайдено Disk Manager - це нне вдаєтьсяобробити\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "знайдено DM6 сигнатуру - відміна операції\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "дивно..., розширений розділ нульового розміру?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "дивно..., BSD розмір нульового розміру?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: невідомий тип таблиці розділів\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "вказано параметр -n: Нічого не змінено\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "не вдається зберегти старі сектори - виконання перервано\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "не вдається записати розділ на %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "довгий або незавершений вхідний рядок - завершення\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "помилка вводу: очікувався символ `=' після поля %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "помилка вводу: очікувався символ %c після поля %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "нерозпізнаний ввід: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "число занадто велике\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "не цифри після числа\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "немає місця для дескриптору розділу\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "не вдається створити оточуючий розширений розділ\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "надто багато вхідних полів\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Немає більше місця\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Недопустимий тип\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 "Попередження: вказаний розмір (%lu) перевищує допустимий розмір (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Попередження: порожній розділ\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Попередження: неправильний початок розділу (раніше %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "не розпізнана завантажувальна ознака - виберіть - або *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "часткова специфікація цил,гол,сект?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Розширений розділ не там де має бути розширений\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "неправильний ввід\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "надто багато розділів\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5667,99 +5665,180 @@ msgstr ""
 "Зазвичай, вам необхідно лише вказати <початок> та <розмір> (та можливо "
 "<тип>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Використання: %s [параметри] пристрій ...\n"
+msgstr "Використання:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "пристрій: щось на зразок /dev/hda чи /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: fdisk/sfdisk.c:2357
-#, c-format
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
+#, fuzzy, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"%d розділів:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "небезпечні параметри:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [or --show-pt-geometry]: вивести видану, яку визначено з таблиці "
+"розділів"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [або --show-extended]: також вивести перелік розширених розділів\n"
+"                              або очікувати їх дескриптори при вводі"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Використання:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s пристрій\t\t вивести активні розділи пристрою\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s пристрій n1 n2 ... активувати розділ n1 ..., де-активувати решту\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An пристрій\t активувати розділ n, де-активувати решту розділів\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5768,62 +5847,62 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, fuzzy, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Використовуйте параметр --force, щоб відхилити всі перевірки.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "немає команди?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "загалом: %llu блоків\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "використання: sfdisk --print-id пристрій номер_розділу\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "використання: sfdisk --change-id пристрій номер_розділу ідентиф.\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "використання: sfdisk --id пристрій номер_пристрою [ідентиф.]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "можна вказувати лише один пристрій (за винятком -l чи -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "неможливі відкрити %s для читання-запису\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "неможливі відкрити %s для читання\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld циліндрів, %ld головок, %ld секторів/трек\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Не вдається отримати розмір %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "неправильний 'активний' байт 0x%x замість 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5831,7 +5910,7 @@ msgstr ""
 "Виконано\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5840,35 +5919,35 @@ msgstr ""
 "Позначено активними %d розділів. Це немає значення для LILO,\n"
 "Але DOS MBR може завантажуватись лише з дисків, у яких 1 активний розділ.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "розділ %s має ідентиф. %x та він не прихований\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Неправильний Ідент. %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Цей диск наразі використовується.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Фатальна помилка: не вдається знайти %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Попередження: %s не є блочним пристроєм\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Перевіряється, що ніхто наразі не використовує диск ...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5881,30 +5960,30 @@ msgstr ""
 "диску.\n"
 "Використовуйте параметр --no-reread щоб обминути цю перевірку.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Використовуйте параметр --force, щоб відхилити всі перевірки.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "Гаразд\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Старий стан:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Розділ %d не існує, не вдається його змінити\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Новий стан:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5912,21 +5991,21 @@ msgstr ""
 "Ці розділи виглядають неправильно - нічого не змінено.\n"
 "(Якщо ви дійсно цього бажаєте, використовуйте параметр --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Ці розділи виглядають неправильно - можливо слід відповісти No\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Ви цим задоволені? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Бажаєте записати на диск? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5935,16 +6014,16 @@ msgstr ""
 "\n"
 "sfdisk: передчасне закінчення вводу\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Завершення - нічого не змінено\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Відповідайте одне з y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5953,7 +6032,7 @@ msgstr ""
 "Успішно записано нову таблицю розділів\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5986,101 +6065,103 @@ msgstr "Синхронізація дисків.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s виконано.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "помилка при встановленні позиції"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "%s: не вдається відкрити %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "umount: %s: не існує"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: помилка %d при декомпресії! %p(%d)\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, fuzzy, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: %s не є lp пристроєм.\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 #, fuzzy
 msgid "Checking all file systems.\n"
 msgstr "Примусова перевірка файлової системи на %s.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6088,58 +6169,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: %s не є lp пристроєм.\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "не вдається відкрити %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s відключено\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Відключення решти файлових систем..."
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Відключення решти файлових систем..."
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: невідомий аргумент: %s\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6156,33 +6237,83 @@ msgstr "порожній довий параметр після аргумент
 msgid "unknown shell after -s or --shell argument"
 msgstr "невідома оболонка після аргументу -s або --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
 msgstr ""
+"       getopt [аргументи] -o|--options спецмф_арг параметри [аргументи] "
+"[--]\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+"  -a, --alternative            Довгі аргументи можуть починались з одного -\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Вивести цю довідку\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=довгі_арг  Специфікація довгих аргументів\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+"  -n, --name=назва_програми    Помилки виводити від імені цієї програми\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=специф_арг     Специфікація коротких аргументів\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+"  -q, --quiet                  Вимкнути повідомлення про помилки від getopt"
+"(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Без звичайного виводу\n"
+
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+"  -s, --shell=оболонка         Встановити стиль цитування як у оболонці\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Перевірити версію getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 Не цитувати вивід\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                Вивести інформацію про версію\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "відсутній аргумент специф_арг"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "внутрішня помилка, зв'яжіться з автором."
 
@@ -6653,92 +6784,110 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "не вдається встановити значення епохи у ядрі.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"%d розділів:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, fuzzy, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  --jensen, --arc, --srm, --funky-toy\n"
 "                вказати hwclock тип вашої системи alpha (дивіться hwclock"
 "(8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "не вдається встановити системний час.\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s не очікує параметрів без ключів. Ви вказали %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6747,7 +6896,7 @@ msgstr ""
 "Ви вказали декілька функцій.\n"
 "Можна виконувати лише одну функцію одночасно.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6756,7 +6905,7 @@ msgstr ""
 "%s: Параметри --utc та --localtime виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6765,7 +6914,7 @@ msgstr ""
 "%s: Параметри --adjust та --noadjfile виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6774,28 +6923,28 @@ msgstr ""
 "%s: Параметри --adjust та --noadjfile виключають одне одного. А ви вказали "
 "обидва.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: Разом з --noadjfile, необхідно вказувати або --utc, або --localtime\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Вказано неправильне значення часу. не вдається встановити годинник.\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "Змінювати значення апаратного годинника може лише адміністратор.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "Змінювати системний час може лише адміністратор.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6803,14 +6952,14 @@ msgstr ""
 "Змінювати значення епохи апаратного годинника у ядрі може лише "
 "адміністратор.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "не вдається отримати доступ до апаратного годинника використовуючи будь-який "
 "відомий метод.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -6988,7 +7137,7 @@ msgid "failed to read mtab"
 msgstr "не вдається запустити %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 #, fuzzy
 msgid "failed to initialize libmount iterator"
 msgstr "не вдається виділити буфер.\n"
@@ -7030,72 +7179,112 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: помилка підключення"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "не вдається записати розділ на %s\n"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "не вдається виділити буфер.\n"
@@ -7183,7 +7372,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "login: помилка PAM, перервано: %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Пароль: "
 
@@ -7633,47 +7822,48 @@ msgstr "НАДМІРНІ символи нового рядка"
 msgid "too many bare linefeeds."
 msgstr "надто багато надмірних нових рядків.\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Вийшов час очікування входу після %d секунд\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Останній вхід: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "з %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "на %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "Помилка відкривання %s"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "ПОМИЛКА ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "ПОМИЛКА ВХОДУ НА %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ З %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d ПОМИЛОК ВХОДУ НА %s, %s"
@@ -7703,7 +7893,7 @@ msgstr "mount: доступ заборонено"
 msgid "setuid failed"
 msgstr "помилка setuid()"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "помилка запуску\n"
@@ -7748,8 +7938,8 @@ msgstr "%s: не вдається встановити контекст для %
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: не вдається розблокувати %s: %s (ваші зміни все ще у %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "помилка створення процесу\n"
@@ -7802,24 +7992,21 @@ msgstr "неправильне значення року: використову
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "використання: cal [-13smjyV] [[місяць] рік]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7931,32 +8118,32 @@ msgstr " Видалити"
 msgid "failed to add line to output"
 msgstr "не вдається виділити буфер.\n"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "помилка позиціювання"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "не вдається виділити буфер.\n"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s: не вдається прочитати %s.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "не вдається виділити буфер.\n"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "помилка виділення пам'яті"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7967,91 +8154,116 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Доступні команди:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "Немає каталогу %s!\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 #, fuzzy
 msgid "failed to initialize libmount cache"
 msgstr "не вдається виділити буфер.\n"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "не вдається виділити буфер.\n"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 #, fuzzy
 msgid "failed to initialize output column"
 msgstr "не вдається виділити буфер.\n"
@@ -8076,12 +8288,12 @@ msgstr "%s: не вдається знайти процес \"%s\"\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: невідомий сигнал %s; правильні сигнали:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "використання: %s [ -s сигнал | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ сигнал ]\n"
@@ -8101,84 +8313,83 @@ msgstr "Розмір блоку: %d\n"
 msgid "connect %s"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 #, fuzzy
 msgid "socket"
 msgstr "nfs сокет"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 #, fuzzy
 msgid "connect"
 msgstr "nfs connect"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Наступний файл: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "не вдається записати розділ на %s\n"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Значення за межами діапазону.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: невідома назва можливості: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: невідома назва пріоритету: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8316,7 +8527,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: не вдається відкрити: %s\n"
 
 #: misc-utils/lsblk.c:809
@@ -8334,12 +8545,13 @@ msgstr "%s: не вдається відкрити: %s\n"
 msgid "failed to parse list '%s'"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8347,7 +8559,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8370,40 +8582,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "не вдається відкрити %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Отримано %d байт з %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "помилка запуску\n"
@@ -8423,24 +8635,12 @@ msgstr "не вдається отримати інформацію про %s"
 msgid "%s - No such file or directory\n"
 msgstr "кореневий вузол не є каталогом"
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr "використання: namei [-mx] шлях [шлях ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"%d розділів:\n"
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8452,19 +8652,18 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "аргумент --date надто довгий\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -8474,169 +8673,167 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s: помилка перейменування %s на %s: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 #, fuzzy
 msgid "bad arguments"
 msgstr "col: неправильний -l аргумент %s.\n"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 #, fuzzy
 msgid "write"
 msgstr "Записати"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 #, fuzzy
 msgid "read count"
 msgstr "прочитано %c\n"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "не вдається запустити %s"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, fuzzy, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "не вдається відкрити %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, fuzzy, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "не вдається відкрити %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, fuzzy, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Помилка читання %s\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, fuzzy, c-format
 msgid "operation %d\n"
 msgstr "неправильний ідентифікатор"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, fuzzy, c-format
 msgid "Invalid operation %d\n"
 msgstr "неправильний ідентифікатор"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, fuzzy, c-format
 msgid "Bad number: %s\n"
 msgstr "%s: неправильне значення\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, fuzzy, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "помилка зімни режиму доступу до %s: %s\n"
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8644,29 +8841,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8702,43 +8898,44 @@ msgid "%s: write failed"
 msgstr "помилка openpty\n"
 
 #: misc-utils/wipefs.c:240
-#, fuzzy, c-format
-msgid "%zd bytes ["
-msgstr "байт"
-
-#: misc-utils/wipefs.c:248
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, fuzzy, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8836,63 +9033,63 @@ msgstr "помилка зімни режиму доступу до %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "не вдається перейменувати %s у %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, fuzzy, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: користувач \"%s\" не існує.\n"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, fuzzy, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: не вдається отримати інформацію про пристрій %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, fuzzy, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", зсув %d"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, fuzzy, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", обмеження на розмір %lld"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, fuzzy, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", шифрування %s (тип %d)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", зсув %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", тип шифрування %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: не вдається отримати інформацію про пристрій %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: не вдається відкрити пристрій %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, fuzzy, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: немає прав доступу до /dev/loop#"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: не вдається знайти жодний вільний loop-пристрій"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8902,58 +9099,56 @@ msgstr ""
 "       підтримує роботу з loop-пристроями (Якщо це так - перекомпілюйте\n"
 "       його або виконайте `modprobe loop')."
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 #, fuzzy
 msgid "Out of memory while reading passphrase"
 msgstr "Недостатньо пам'яті для збільшення буфера.\n"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, fuzzy, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "Сектор %d вже розподілений\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, fuzzy, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "mount: %s%s захищений від запису, монтується лише для читання"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "не вдається заблокувати у пам'яті, завершення.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, fuzzy, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu): успішно завершено\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): успішно завершено\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: не вдається видалити пристрій %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Програма mount була скомпільована без підтримки loop-пристроїв. "
 "Перекомпілюйте її \n"
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8961,7 +9156,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "використання:\n"
 "  %s loop_пристрій                                    # отримати інформацію\n"
@@ -8969,48 +9164,45 @@ msgstr ""
 "  %s -f                                               # знайти вільний\n"
 "  %s [ -e шифрування ] [ -o зсув ] loop_пристрій файл # встановити\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, fuzzy, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, fuzzy, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, fuzzy, c-format
 msgid "Loop device is %s\n"
 msgstr "loop: не вдається відкрити пристрій %s: %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, fuzzy, c-format
 msgid "%s: %s: device is busy"
 msgstr "umount: %s: пристрій зайнятий"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -9565,163 +9757,166 @@ msgstr "помилка при виклику xstrndup"
 msgid "not enough memory"
 msgstr "недостатньо пам'яті"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, fuzzy, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: Неочікуваний кінець файла у файлі %s\n"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "помилка запуску\n"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 #, fuzzy
 msgid "waitpid failed"
 msgstr "помилка setuid()"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, fuzzy, c-format
 msgid "%s: write signature failed"
 msgstr "Помилка відкривання %s"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 #, fuzzy
 msgid "same"
 msgstr "Назва"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, fuzzy, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: попередження: %s має небезпечні права %04o, пропонується %04o\n"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: попередження: %s має небезпечні права %04o, пропонується %04o\n"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, fuzzy, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: пропускається файл %s - схоже, що він містить дірки.\n"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s на %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, fuzzy, c-format
 msgid "cannot find the device for %s"
 msgstr "%s: не вдається знайти пристрій для %s\n"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 #, fuzzy
 msgid "Not superuser."
 msgstr "Не адміністратор.\n"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "помилка при встановленні позиції"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9996,7 +10191,7 @@ msgstr "Попередження: видалення розділів після
 msgid "%s: error deleting partitions %d-%d"
 msgstr "Попередження: видалення розділів після %d\n"
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10056,19 +10251,13 @@ msgstr "   p   вивести таблицю розділів BSD"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Диск %s не містить правильної таблиці розділів\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10079,47 +10268,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Доступні команди:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "не вдається виділити буфер.\n"
@@ -10247,7 +10435,7 @@ msgstr "не вдається записати розділ на %s\n"
 msgid "failed to set pid %d's policy"
 msgstr "не вдається записати розділ на %s\n"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, fuzzy, c-format
 msgid "failed to execute %s"
 msgstr "помилка зчитування часу у ioctl() з %s"
@@ -10521,7 +10709,7 @@ msgstr "%s: %ld - типова межа, та %ld - типовий таймау�
 msgid "Can't set signal handler"
 msgstr "не вдається встановити обробник сигналу"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "помилка у gettimeofday"
 
@@ -10530,7 +10718,7 @@ msgstr "помилка у gettimeofday"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "не вдається дати CYGETMON на %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10538,12 +10726,12 @@ msgstr ""
 "%s: %lu переривань, %lu/%lu симв.; fifo: %lu межа, %lu таймаут, %lu макс, "
 "%lu зараз\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f перерв/сек; %f отрим, %f відпр (симв/сек)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10551,7 +10739,7 @@ msgstr ""
 "%s: %lu переривань, %lu симв; fifo: %lu межа, %lu таймаут, %lu макс, %lu "
 "зараз\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f перерв/сек; %f отрим (симв/сек)\n"
@@ -10643,124 +10831,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "Використання: %s [параметри] пристрій ...\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: Невідома команда: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "Немає каталогу %s!\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "помилка виконання fsync"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "(Наступний файл: %s)"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "немає команди?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "помилка виконання fsync"
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10768,43 +10939,43 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 #, fuzzy
 msgid "no length argument specified"
 msgstr "Надто багато параметрів.\n"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 #, fuzzy
 msgid "invalid length value specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 #, fuzzy
 msgid "invalid offset value specified"
 msgstr "Неправильне встановлене значення: %s\n"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 #, fuzzy
 msgid "no filename specified."
 msgstr "Не було вказано параметр --date.\n"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 #, fuzzy
 msgid "unexpected number of arguments"
 msgstr "максимальна кількість сегментів = %lu\n"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, fuzzy, c-format
 msgid "%s: fallocate failed"
 msgstr "помилка openpty\n"
@@ -10812,100 +10983,100 @@ msgstr "помилка openpty\n"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s вимагає вказування аргументу\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: не вдається відкрити %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, fuzzy, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: неправильне значення\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "помилка створення процесу\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, fuzzy, c-format
+#: sys-utils/fsfreeze.c:49
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 #, fuzzy
 msgid "no action specified"
 msgstr "Не було вказано параметр --date.\n"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 #, fuzzy
 msgid "no filename specified"
 msgstr "Не було вказано параметр --date.\n"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "помилка при встановленні позиції"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "кореневий вузол не є каталогом"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "помилка openpty\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "помилка openpty\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10914,101 +11085,92 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "помилка зчитування часу у ioctl() з %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "Не було вказано параметр --date.\n"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "кореневий вузол не є каталогом"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "помилка openpty\n"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr "Використання: %s [параметри] пристрій ...\n"
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
-msgstr ""
+msgstr "Finger інформацію змінено.\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, fuzzy, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 "\n"
 "Сегмент спільної пам'яті shmid=%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, fuzzy, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 "\n"
 "Черга повідомлень msqid=%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 #, fuzzy
 msgid "create semaphore failed"
 msgstr "виділено семафорів = %d\n"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, fuzzy, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -11503,8 +11665,8 @@ msgstr ""
 "Сегмент спільної пам'яті shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11513,8 +11675,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "режим=%#o\tправа_доступу=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "байт=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11547,8 +11709,8 @@ msgstr ""
 "Черга повідомлень msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11581,8 +11743,8 @@ msgstr ""
 "Масив семафорів semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11630,71 +11792,69 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, fuzzy, c-format
 msgid "invalid speed: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, fuzzy, c-format
 msgid "ldattach from %s\n"
 msgstr "%s з %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 #, fuzzy
 msgid "invalid option"
 msgstr "неправильний ідентифікатор"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, fuzzy, c-format
 msgid "invalid line discipline: %s"
 msgstr "неправильний ідентифікатор: %s\n"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, fuzzy, c-format
 msgid "%s is not a serial line"
 msgstr "%s не є спеціальним файлом блочного пристрою"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, fuzzy, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, fuzzy, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "не вдається отримати розмір %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 #, fuzzy
 msgid "cannot set line discipline"
 msgstr "Помилка позиціювання на дисковому пристрої"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 #, fuzzy
 msgid "cannot daemonize"
 msgstr "не вдається отримати розмір %s"
@@ -11851,48 +12011,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "кореневий вузол не є каталогом"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s підключено.\t "
@@ -11929,55 +12084,50 @@ msgstr ""
 "\t -n            вимкнути автоматичне визначення порядку байтів\n"
 "\t -V            вивести версію та вийти\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, fuzzy, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "mount: помилка запису %s: %s"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Крок_профілювання: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): неправильний рядок мапи\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: не вдається знайти \"_stext\" у %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: адреса профілю поза діапазоном. Неправильний файл мапи?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "загалом"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11986,240 +12136,231 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, fuzzy, c-format
 msgid "renice from %s\n"
 msgstr "%s з %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: Невідома команда: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "неправильне значення періоду очікування: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "користувач"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "не вдається записати розділ на %s\n"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "не вдається записати розділ на %s\n"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: старий пріоритет %d, новий пріоритет %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "Використання: %s [параметри] пристрій ...\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "помилка у gettimeofday"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "виділено семафорів = %d\n"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr ""
 "\n"
 "Помилка закривання файлу\n"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "помилка при встановленні позиції"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "виділено семафорів = %d\n"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "помилка у gettimeofday"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr " %s: невідомий тип таблиці розділів\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "%s: не вдається відкрити: %s\n"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, fuzzy, c-format
 msgid "Using UTC time.\n"
 msgstr "Використовується %s.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, fuzzy, c-format
 msgid "Using local time.\n"
 msgstr "Використовується %s.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s не є lp пристроєм.\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "Повідомлення від %s@%s до %s у %s ..."
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "Повідомлення від %s@%s до %s у %s ..."
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "помилка зчитування часу у ioctl() з %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "(Наступний файл: %s)"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -12270,17 +12411,17 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr "Спробуйте `getopt --help', щоб отримати додаткову інформацію.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, fuzzy, c-format
 msgid "%s: Unrecognized architecture"
 msgstr " %s: невідомий тип таблиці розділів\n"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 #, fuzzy
 msgid "Not enough arguments"
 msgstr "Надто багато параметрів.\n"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, fuzzy, c-format
 msgid "Failed to set personality to %s"
 msgstr "не вдається записати розділ на %s\n"
@@ -12366,173 +12507,171 @@ msgstr "%s використовує IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s використовує опитування стану\n"
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, fuzzy, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr "використання: %s програма [аргументи ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, fuzzy, c-format
+#: sys-utils/unshare.c:68
+#, fuzzy
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "помилка при встановленні позиції"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 #, fuzzy
 msgid "cannot set group id"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: не вдається запустити %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "помилка зімни режиму доступу до %s: %s\n"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: не вдається знайти процес \"%s\"\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: не вдається запустити %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "не вдається виділити буфер.\n"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "неправильне значення періоду очікування: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Надто багато параметрів.\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "не вдається виділити буфер.\n"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "неправильне значення швидкості: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "надто багато запасних значень швидкості"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: не вдається відкрити стандартний ввід: %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: не є символьним пристроєм"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: не вдається відкрити для читання/запису"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: помилка при dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "тип: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: прочитано: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: переповнення вводу"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12544,69 +12683,63 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "користувач"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "користувачів"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "помилка при встановленні позиції"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "(Наступний файл: %s)"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "встановлено y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "встановлено  n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "виділено семафорів = %d\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "неправильний ідентифікатор: %s\n"
@@ -12623,52 +12756,46 @@ msgstr ""
 "використовувати.\n"
 "Сценарій не запущено.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, fuzzy, c-format
 msgid "cannot open timing file %s"
 msgstr "не вдається відкрити файл '%s'"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Сценарій запущено, файл - %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Сценарій запущено на %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: не вдається знайти пристрій для %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12677,80 +12804,77 @@ msgstr ""
 "\n"
 "Сценарій завершено на %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Сценарій завершено, файл %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "помилка openpty\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Скінчились pty-пристрої\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 #, fuzzy
 msgid "write to stdout failed"
 msgstr "Помилка відкривання %s"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, fuzzy, c-format
 msgid "failed to read typescript file %s"
 msgstr "помилка зчитування часу у ioctl() з %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "максимальна кількість сегментів = %lu\n"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, fuzzy, c-format
 msgid "cannot open typescript file %s"
 msgstr "не вдається відкрити файл '%s'"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, fuzzy, c-format
 msgid "failed to read timing file %s"
 msgstr "помилка зчитування часу у ioctl() з %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, fuzzy, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "%s: Неочікуваний кінець файла у файлі %s\n"
@@ -12761,111 +12885,108 @@ msgid "Argument error."
 msgstr "%s: Помилка у параметрах, використання\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr "Finger інформацію змінено.\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "не вдається створити процес"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "не вдається створити процес"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "не вдається відкрити %s\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "не вдається встановити/зняти режим енергозбереження\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "не вдається відкрити пристрій %s для запису\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "помилка klogctl %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Помилка запису знімку екрану \n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "не вдається відкрити %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: не визначено $TERM.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: невідомий сигнал %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12893,142 +13014,144 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Використання: %s [параметри] пристрій ...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "неправильний ідентифікатор"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "неправильне значення періоду очікування: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: не вдається відкрити тимчасовий файл.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "mount: помилка встановлення швидкості: %s"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "не вдається отримати розмір диску"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Широкомовне повідомлення від %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: не буде прочитано %s - використовується stdin.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "помилка при встановленні позиції"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "(Наступний файл: %s)"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "використання: namei [-mx] шлях [шлях ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: не вдається  знайти назву вашого tty\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: у вас немає прав запису.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s не ввійшов у систему на %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: для %s вивід повідомлень вимкнено на %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s не ввійшов у систему\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: для %s вивід повідомлень вимкнено\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s ввійшов у систему більше одного разу; надсилається на %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Вхідний рядок надто довгий.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Повідомлення від %s@%s (як %s) до %s у %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Повідомлення від %s@%s до %s у %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "помилка виділення пам'яті"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13207,7 +13330,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13411,7 +13534,7 @@ msgstr ""
 "\n"
 "Шаблон не знайдено\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Шаблон не знайдено"
 
@@ -13476,7 +13599,7 @@ msgstr "hexdump: неправильний формат {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: неправильний символ перетворення %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13504,7 +13627,7 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13512,81 +13635,81 @@ msgstr ""
 "%s: Використання: %s [-number] [-p рядок] [-cefnrs] [+line] [+/pattern/] "
 "[файли]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: параметр потребує вказування аргументу -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: неправильний параметр -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...перехід вперед\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...перехід назад\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Немає наступного файлу"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Немає попереднього файлу"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Помилка читання з файлу %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: Неочікуваний кінець файла у файлі %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Невідома помилка у файлі %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: не вдається створити тимчасовий файл\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Помилка РВ: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(Кінець файлу)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Немає збереженого у пам'яті рядку пошуку"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "не вдається відкрити "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "збережено"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": команда ! не допустима у режимі rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "помилка виконання fork(), спробуйте пізніше ще раз\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Наступний файл: "
 
@@ -13654,8 +13777,8 @@ msgstr "Використання: %s [параметри] пристрій ...\n
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13671,39 +13794,105 @@ msgstr "%s: не вдається відкрити: %s\n"
 msgid "no input file specified"
 msgstr "Не було вказано параметр --date.\n"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Використання: %s [параметри] пристрій ...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "проблема при читанні terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Невідома escape-послідовність на вході: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Вхідний рядок надто довгий.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Використання:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Помилка закривання файлу\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Пробачте, Ви можете змінити тег не-порожніх розділів.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Попередження: розділ %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Попередження: розділи %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "та %s перекриваються\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "пристрій: щось на зразок /dev/hda чи /dev/sda"
+
+#, fuzzy
+#~ msgid "%zd bytes ["
+#~ msgstr "байт"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "Використання: %s [параметри] пристрій ...\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Використання: %s [параметри] пристрій ...\n"
 
 #, fuzzy
 #~ msgid "  %s -V\n"
@@ -13850,27 +14039,10 @@ msgstr "Вхідний рядок надто довгий.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [або --help]:      вивести це повідомлення"
 
-#~ msgid "dangerous options:"
-#~ msgstr "небезпечні параметри:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g [або --show-geometry]: вивести видану ядром геометрію"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [or --show-pt-geometry]: вивести видану, яку визначено з таблиці "
-#~ "розділів"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [або --show-extended]: також вивести перелік розширених розділів\n"
-#~ "                              або очікувати їх дескриптори при вводі"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -13930,56 +14102,9 @@ msgstr "Вхідний рядок надто довгий.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [аргументи] [--] специф_арг параметри\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [аргументи] -o|--options спецмф_арг параметри [аргументи] "
-#~ "[--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              параметри\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Довгі аргументи можуть починались з одного "
-#~ "-\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Вивести цю довідку\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=довгі_арг  Специфікація довгих аргументів\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr ""
-#~ "  -n, --name=назва_програми    Помилки виводити від імені цієї програми\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=специф_арг     Специфікація коротких аргументів\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr ""
-#~ "  -q, --quiet                  Вимкнути повідомлення про помилки від "
-#~ "getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Без звичайного виводу\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=оболонка         Встановити стиль цитування як у оболонці\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Перевірити версію getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 Не цитувати вивід\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                Вивести інформацію про версію\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (розширена) 1.1.4\n"
 
diff --git a/po/util-linux.pot b/po/util-linux.pot
index b50e878e3..845a94cc3 100644
--- a/po/util-linux.pot
+++ b/po/util-linux.pot
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+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"
@@ -16,6 +16,7 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: disk-utils/blockdev.c:61
 msgid "set read-only"
@@ -102,29 +103,29 @@ msgstr ""
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr ""
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -202,7 +203,7 @@ msgid "Verifying ... "
 msgstr ""
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, c-format
 msgid "cannot open file %s"
 msgstr ""
@@ -240,15 +241,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -261,7 +262,7 @@ msgstr ""
 msgid "cannot stat file %s"
 msgstr ""
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, c-format
 msgid "%s: not a block device"
@@ -305,8 +306,8 @@ msgid "stat failed: %s"
 msgstr ""
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr ""
@@ -528,359 +529,359 @@ msgstr ""
 msgid "compiled without -x support"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr ""
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
 "Write request ignored\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:638
+#: disk-utils/fsck.minix.c:649
 #, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
 #, c-format
-msgid "Inode %d mode not cleared."
+msgid "Inode %lu mode not cleared."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
 #, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
 #, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
 #, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
 #, c-format
-msgid "Zone %d: marked in use, no file uses it."
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
 #, c-format
-msgid "Zone %d: in use, counted=%d\n"
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
 #, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -894,7 +895,7 @@ msgid ""
 "%6d files\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1013,7 +1014,7 @@ msgstr ""
 msgid "not enough space, need at least %llu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
@@ -1163,7 +1164,7 @@ msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:668
 #, c-format
-msgid "closing file %s"
+msgid "cannot close file %s"
 msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:728
@@ -1263,185 +1264,195 @@ msgid ""
 "that some device files will be wrong."
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, c-format
 msgid "%s: unable to clear boot sector"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, c-format
 msgid "%s: seek failed in write_tables"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, c-format
 msgid "%s: unable to write super-block"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, c-format
 msgid "%s: unable to write inode map"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, c-format
 msgid "%s: unable to write zone map"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, c-format
 msgid "%s: unable to write inodes"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, c-format
 msgid "%s: seek failed in write_block"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, c-format
 msgid "%s: write failed in write_block"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, c-format
 msgid "%s: too many bad blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, c-format
 msgid "%s: not enough good blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, c-format
+msgid "%lu inodes\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:540
+#, c-format
+msgid "%lu blocks\n"
+msgstr ""
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, c-format
 msgid "%s: cannot read badblocks file"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, c-format
 msgid "%s: bad inode size"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, c-format
 msgid "%s: device is misaligned"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, c-format
 msgid "%s: number of blocks too small"
 msgstr ""
@@ -1765,7 +1776,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr ""
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2089,7 +2100,7 @@ msgid "   Logical"
 msgstr ""
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr ""
 
@@ -2712,12 +2723,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2861,7 +2872,7 @@ msgid "tracks/cylinder"
 msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr ""
 
@@ -2928,12 +2939,12 @@ msgstr ""
 msgid "This partition already exists.\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3133,7 +3144,7 @@ msgstr ""
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr ""
 
@@ -3525,7 +3536,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr ""
 
@@ -3604,7 +3615,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3738,37 +3749,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3777,64 +3788,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4101,7 +4112,7 @@ msgstr ""
 
 #: fdisk/fdisksgilabel.c:536
 #, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
 msgstr ""
 
 #: fdisk/fdisksgilabel.c:542
@@ -4113,7 +4124,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr ""
 
@@ -4292,26 +4303,26 @@ msgstr ""
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4319,14 +4330,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4335,7 +4346,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4348,7 +4359,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4357,28 +4368,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -4833,7 +4844,7 @@ msgstr ""
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4841,161 +4852,161 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
 "before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5003,362 +5014,423 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr ""
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1236
 #, c-format
-msgid "Warning: partitions %s "
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1259
+#: fdisk/sfdisk.c:1248
 #, c-format
-msgid "and %s overlap\n"
+msgid "Warning: partitions %s and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr ""
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2352
-#, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
+msgid " %s [options] <device> [...]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr ""
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2364
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5367,103 +5439,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5471,73 +5543,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5565,99 +5637,100 @@ msgstr ""
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+msgid "succeeded"
 msgstr ""
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 msgid "failed"
 msgstr ""
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, c-format
 msgid "WARNING: couldn't open %s"
 msgstr ""
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, c-format
 msgid "%s: not found"
 msgstr ""
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr ""
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr ""
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, c-format
 msgid ""
 "\n"
@@ -5665,55 +5738,55 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr ""
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 msgid "too many devices"
 msgstr ""
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, c-format
 msgid "couldn't open %s"
 msgstr ""
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 msgid "Is /proc mounted?"
 msgstr ""
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr ""
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr ""
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 msgid "too many arguments"
 msgstr ""
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -5730,33 +5803,65 @@ msgstr ""
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt/getopt.c:314
+#: getopt/getopt.c:317
 #, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
 msgstr ""
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:323
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+
+#: getopt/getopt.c:324
+msgid " -h, --help                   This small usage guide\n"
+msgstr ""
+
+#: getopt/getopt.c:325
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:326
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+
+#: getopt/getopt.c:327
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:328
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+
+#: getopt/getopt.c:329
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr ""
+
+#: getopt/getopt.c:330
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+
+#: getopt/getopt.c:331
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr ""
+
+#: getopt/getopt.c:332
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr ""
+
+#: getopt/getopt.c:333
+msgid " -V, --version                Output version information\n"
+msgstr ""
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr ""
 
@@ -6158,136 +6263,150 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 msgid "Unable to connect to audit system"
 msgstr ""
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 msgid "failed to parse epoch"
 msgstr ""
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time."
 msgstr ""
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr ""
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
 msgstr ""
@@ -6458,7 +6577,7 @@ msgid "failed to read mtab"
 msgstr ""
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr ""
 
@@ -6499,69 +6618,109 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr ""
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr ""
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 msgid "failed to append options"
 msgstr ""
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 msgid "failed to set options pattern"
 msgstr ""
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 msgid "failed to allocate source buffer"
 msgstr ""
 
@@ -6643,7 +6802,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr ""
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr ""
 
@@ -7059,46 +7218,47 @@ msgstr ""
 msgid "too many bare linefeeds."
 msgstr ""
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr ""
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 msgid "write lastlog failed"
 msgstr ""
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -7123,7 +7283,7 @@ msgstr ""
 msgid "setuid failed"
 msgstr ""
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr ""
@@ -7168,8 +7328,8 @@ msgstr ""
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr ""
 
@@ -7220,24 +7380,21 @@ msgstr ""
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr ""
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7339,29 +7496,29 @@ msgstr ""
 msgid "failed to add line to output"
 msgstr ""
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, c-format
 msgid "%s: parse error at line %d"
 msgstr ""
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 msgid "failed to initialize libmount table"
 msgstr ""
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, c-format
 msgid "can't read %s"
 msgstr ""
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 msgid "failed to initialize libmount tabdiff"
 msgstr ""
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 msgid "poll() failed"
 msgstr ""
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7372,88 +7529,113 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr ""
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 msgid "failed to parse timeout"
 msgstr ""
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr ""
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr ""
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr ""
 
@@ -7476,12 +7658,12 @@ msgstr ""
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr ""
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr ""
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr ""
@@ -7501,81 +7683,80 @@ msgstr ""
 msgid "connect %s"
 msgstr ""
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr ""
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr ""
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, c-format
+msgid " %s [options] [message]\n"
+msgstr ""
+
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
 msgstr ""
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:147
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, c-format
 msgid "file %s"
 msgstr ""
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 msgid "failed to parse port number"
 msgstr ""
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, c-format
 msgid "port `%ld' out of range"
 msgstr ""
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, c-format
 msgid "unknown facility name: %s."
 msgstr ""
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, c-format
 msgid "unknown priority name: %s."
 msgstr ""
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr ""
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -7705,7 +7886,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr ""
 
 #: misc-utils/lsblk.c:809
@@ -7723,12 +7904,13 @@ msgstr ""
 msgid "failed to parse list '%s'"
 msgstr ""
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, c-format
 msgid ""
 "\n"
@@ -7736,7 +7918,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -7759,40 +7941,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, c-format
 msgid "Could not open %s"
 msgstr ""
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, c-format
 msgid "closing %s failed"
 msgstr ""
@@ -7812,22 +7994,12 @@ msgstr ""
 msgid "%s - No such file or directory\n"
 msgstr ""
 
-#: misc-utils/namei.c:411
+#: misc-utils/namei.c:413
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -7839,18 +8011,17 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 msgid "pathname argument is missing"
 msgstr ""
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -7860,166 +8031,164 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr ""
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr ""
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr ""
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr ""
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr ""
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8027,29 +8196,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr ""
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8083,42 +8251,43 @@ msgstr ""
 
 #: misc-utils/wipefs.c:240
 #, c-format
-msgid "%zd bytes ["
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:248
+#: misc-utils/wipefs.c:295
 #, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid "invalid offset value '%s' specified"
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:305
 #, c-format
-msgid "invalid offset value '%s' specified"
+msgid " %s [options] <device>\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8207,118 +8376,116 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%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/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8326,51 +8493,48 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8883,159 +9047,162 @@ msgstr ""
 msgid "not enough memory"
 msgstr ""
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr ""
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr ""
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr ""
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr ""
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr ""
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr ""
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr ""
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr ""
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr ""
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr ""
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr ""
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9292,7 +9459,7 @@ msgstr ""
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -9352,19 +9519,13 @@ msgstr ""
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr ""
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -9375,46 +9536,44 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, c-format
+#: partx/partx.c:601
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr ""
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr ""
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 msgid "failed to parse --nr <M-N> range"
 msgstr ""
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr ""
@@ -9539,7 +9698,7 @@ msgstr ""
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9794,7 +9953,7 @@ msgstr ""
 msgid "Can't set signal handler"
 msgstr ""
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr ""
 
@@ -9803,24 +9962,24 @@ msgstr ""
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr ""
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr ""
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
@@ -9905,119 +10064,102 @@ msgstr ""
 msgid "ftp daemon"
 msgstr ""
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, c-format
 msgid "failed to parse level '%s'"
 msgstr ""
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, c-format
 msgid "unknown level '%s'"
 msgstr ""
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, c-format
 msgid "failed to parse facility '%s'"
 msgstr ""
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, c-format
 msgid "unknown facility '%s'"
 msgstr ""
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 msgid "sysinfo failed"
 msgstr ""
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 msgid "write failed"
 msgstr ""
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 msgid "failed to parse buffer size"
 msgstr ""
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 msgid "unsupported command"
 msgstr ""
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 msgid "klogctl failed"
 msgstr ""
 
-#: sys-utils/fallocate.c:52
+#: sys-utils/fallocate.c:55
 #, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <filename>\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10025,38 +10167,38 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr ""
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr ""
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr ""
@@ -10064,98 +10206,97 @@ msgstr ""
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr ""
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr ""
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr ""
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr ""
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10164,95 +10305,84 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, c-format
 msgid "failed to parse length: %s"
 msgstr ""
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, c-format
 msgid "failed to parse offset: %s"
 msgstr ""
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr ""
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 msgid "no mountpoint specified."
 msgstr ""
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, c-format
 msgid "%s: not a directory"
 msgstr ""
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr ""
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:84
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -10740,7 +10870,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:621
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:623
@@ -10750,7 +10880,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:625
 #, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:628
@@ -10781,7 +10911,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:647
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:649
@@ -10812,7 +10942,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:680
 #, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:682
@@ -10860,69 +10990,67 @@ msgstr ""
 msgid "invalid iflag: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr ""
 
@@ -11071,48 +11199,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, c-format
 msgid "%s is not a mountpoint\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, c-format
 msgid "%s is a mountpoint\n"
 msgstr ""
@@ -11135,55 +11258,50 @@ msgid ""
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr ""
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11192,228 +11310,217 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, c-format
+#: sys-utils/renice.c:69
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr ""
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr ""
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, c-format
 msgid "unknown user %s"
 msgstr ""
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, c-format
 msgid "bad value %s"
 msgstr ""
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 msgid "user ID"
 msgstr ""
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr ""
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr ""
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:86
-#, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:90
-#, c-format
-msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
-msgstr ""
-
-#: sys-utils/rtcwake.c:100
-#, c-format
+#: sys-utils/rtcwake.c:101
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 msgid "read rtc time failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 msgid "read system time failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 msgid "convert rtc time failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 msgid "set rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 msgid "read rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 msgid "convert time failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr ""
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 msgid "failed to parse seconds value"
 msgstr ""
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 msgid "failed to parse time_t value"
 msgstr ""
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, c-format
 msgid "%s not enabled for wakeup events"
 msgstr ""
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, c-format
 msgid "unable to execute %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 msgid "rtc read failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -11464,16 +11571,16 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr ""
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr ""
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr ""
@@ -11553,169 +11660,166 @@ msgstr ""
 msgid "%s using polling\n"
 msgstr ""
 
-#: sys-utils/unshare.c:57
+#: sys-utils/unshare.c:59
 #, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+msgid " %s [options] <program> [args...]\n"
 msgstr ""
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr ""
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr ""
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr ""
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr ""
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr ""
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, c-format
 msgid "%s: can't change process priority: %m"
 msgstr ""
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr ""
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
 #, c-format
-msgid "bad timeout value: %s"
+msgid "failed to allocate memory: %m"
 msgstr ""
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
-msgid "not enough arguments"
+#: term-utils/agetty.c:649
+#, c-format
+msgid "bad timeout value: %s"
 msgstr ""
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, c-format
-msgid "failed to allocate memory: %m"
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
+msgid "not enough arguments"
 msgstr ""
 
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr ""
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr ""
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr ""
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr ""
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr ""
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr ""
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr ""
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -11727,66 +11831,60 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr ""
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 msgid "ttyname failed"
 msgstr ""
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, c-format
 msgid "stat %s failed"
 msgstr ""
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 msgid "is y"
 msgstr ""
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 msgid "is n"
 msgstr ""
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, c-format
 msgid "change %s mode failed"
 msgstr ""
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, c-format
 msgid "invalid argument: %c"
 msgstr ""
@@ -11799,127 +11897,118 @@ msgid ""
 "Program not started."
 msgstr ""
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr ""
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr ""
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 msgid "cannot write script file"
 msgstr ""
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 msgid "openpty failed"
 msgstr ""
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 msgid "out of pty's"
 msgstr ""
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr ""
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 msgid "wrong number of arguments"
 msgstr ""
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr ""
@@ -11929,104 +12018,101 @@ msgid "Argument error."
 msgstr ""
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr ""
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 msgid "cannot force blank"
 msgstr ""
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 msgid "cannot force unblank"
 msgstr ""
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 msgid "cannot get blank status"
 msgstr ""
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 msgid "cannot (un)set powersave mode"
 msgstr ""
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, c-format
 msgid "can not open dump file %s for output"
 msgstr ""
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 msgid "klogctl error"
 msgstr ""
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 msgid "Error writing screendump"
 msgstr ""
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, c-format
 msgid "Couldn't read %s"
 msgstr ""
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 msgid "$TERM is not defined."
 msgstr ""
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, c-format
 msgid "%s: unknown terminal type"
 msgstr ""
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12054,134 +12140,136 @@ msgstr ""
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr ""
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 msgid "invalid timeout argument"
 msgstr ""
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, c-format
 msgid "invalid timeout argument: %s"
 msgstr ""
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, c-format
 msgid "can't open temporary file %s"
 msgstr ""
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 msgid "cannot get passwd uid"
 msgstr ""
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 msgid "cannot get tty name"
 msgstr ""
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr ""
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr ""
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 msgid "fstat failed"
 msgstr ""
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 msgid "fread failed"
 msgstr ""
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 msgid "can't find your tty's name"
 msgstr ""
 
-#: term-utils/write.c:146
-msgid "you have write permission turned off."
+#: term-utils/write.c:148
+msgid "you have write permission turned off"
 msgstr ""
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr ""
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, c-format
 msgid "%s has messages disabled on %s"
 msgstr ""
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, c-format
 msgid "%s is not logged in"
 msgstr ""
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, c-format
 msgid "%s has messages disabled"
 msgstr ""
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr ""
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, c-format
 msgid "tty path %s too long"
 msgstr ""
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 msgid "carefulputc failed"
 msgstr ""
 
+#: text-utils/col.c:120
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -12353,7 +12441,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -12518,7 +12606,7 @@ msgid ""
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr ""
 
@@ -12580,7 +12668,7 @@ msgstr ""
 msgid "bad conversion character %%%s"
 msgstr ""
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -12608,87 +12696,87 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr ""
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr ""
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr ""
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr ""
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr ""
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr ""
 
@@ -12756,8 +12844,8 @@ msgstr ""
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -12771,32 +12859,40 @@ msgstr ""
 msgid "no input file specified"
 msgstr ""
 
+#: text-utils/ul.c:135
+#, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr ""
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr ""
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr ""
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 msgid "Input line too long."
 msgstr ""
diff --git a/po/vi.po b/po/vi.po
index 1e1ee2363..5ccc2a5ce 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,8 +7,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.18-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-10-03 22:15+1030\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n"
@@ -106,29 +106,29 @@ msgstr "đọc lại bảng phân vùng"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "lấy kích cỡ theo phần 512 byte"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "không mở được %s"
@@ -211,7 +211,7 @@ msgid "Verifying ... "
 msgstr "Đang kiểm tra ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "Không thể mở tập tin '%s'"
@@ -251,15 +251,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -272,7 +272,7 @@ msgstr "%s từ %s\n"
 msgid "cannot stat file %s"
 msgstr "không thể lấy trạng thái về thiết bị %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -321,8 +321,8 @@ msgid "stat failed: %s"
 msgstr "lỗi lấy trạng thái: %s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "lỗi mở : %s"
@@ -544,55 +544,55 @@ msgstr "sai đặt hiệu dữ liệu tập tin"
 msgid "compiled without -x support"
 msgstr "biên dịch mà không hỗ trợ -x"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s: OK\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "Sử dụng: %s [-larvsmf] /dev/TÊN\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s đã được gắn.\t "
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "Bạn có thực sự muốn tiếp tục"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "kiểm tra bị dừng.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "Vùng nr < VÙNGĐẦUTIÊN trong tập tin `%s'."
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "Vùng nr >= CÁCVÙNG trong tập tin `%s'."
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "Xoá khối"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "Lỗi đọc: không thể tìm tới khối trong tập tin '%s'\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "Lỗi đọc: khối xấu trong tập tin '%s'\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -601,294 +601,294 @@ msgstr ""
 "Lỗi nội bộ : ghi vào khối xấu\n"
 "Yêu cầu ghi bị bỏ qua\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "tìm kiếm bị lỗi trong ghi_khối"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "Lỗi ghi: khối xấu trong tập tin '%s'\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "tìm kiếm bị lỗi trong ghi_siêu_ khối"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "không thể ghi siêu khối"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "Không thể ghi sơ đồ inode"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "Không thể ghi sơ đồ vùng"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "Không thể ghi các inode"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "tìm nơi bị lỗi"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "không thể cấp phát vùng đệm cho siêu khối"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "không thể đọc siêu khối"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "số magic xấu trong siêu khối"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "Chỉ hỗ trợ khối/vùng 1k"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "vùng s_imap_blocks xấu trong siêu khối"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "vùng s_zmap_blocks xấu trong siêu khối"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "Không thể phân phối bộ đệm cho sơ đồ inode"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "Không thể phân cấp bộ đệm cho sơ đồ vùng"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "Không thể phân phối bộ đệm cho các inode"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "Không thể phân phối bộ đệm cho việc đếm inode"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "Không thể phân phối bộ đệm cho việc đếm vùng"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "Không thể đọc sơ đồ inode"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "Không thể đọc sơ đồ vùng"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "Không thể đọc các inode"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "Cảnh báo : Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inode\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld khối\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Vùng_dữ_liệu_đầu_tiên=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Cỡ_vùng=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Cỡ_tối_đa=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Trạng thái hệ thống tập tin=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "độ_dài_tên=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "inode %d đánh dấu không sử dụng, nhưng lại dùng cho tập tin '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "Dấu được dùng"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "Tập tin `%s' có chế độ %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "Cảnh báo : số đếm inode quá lớn.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "inode gốc không phải là một thư mục"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "Khối đã được dùng. Bây giờ trong tập tin `%s'."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "Xóa"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "Khối %d trong tập tin `%s' có dấu « không dùng »."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "Sửa"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "Thư mục '%s' chứa một số hiệu inode xấu cho tập tin '%.*s'."
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " Bỏ"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: thư mục xấu : '.' không phải đứng đầu\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: thư mục xấu : '..' không phải đứng thứ hai\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "lỗi nội bộ"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: thư mục xấu : kích cỡ < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "tìm nơi không thành công trong bad_zone (vùng_xấu)"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Chưa xóa chế độ inode %d."
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Chưa sử dụng inode %d, còn đánh dấu « đã dùng » trong ảnh mảng."
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Đã sử dụng inode %d, còn đánh dấu « chưa dùng » trong ảnh mảng."
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "Đặt"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (chế độ = %07o), i_nlinks=%d, đếm=%d."
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "Đặt i_nlinks cho số đếm"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "Vùng %d: được đánh dấu là đang dùng, không tập tin nào dùng nó."
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "Bỏ đánh dấu"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "Vùng %d: đang dùng, đếm=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "Vùng %d: không dùng, đếm=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "kích cỡ inode xấu"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "kích cỡ inode v2 xấu"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "cần dùng thiết bị cuối cho những sửa chữa tương tác qua lại"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "không mở được « %s »: %s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s sạch sẽ, không kiểm tra.\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "Bắt buộc kiểm tra hệ thống tập tin trên %s.\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "Hệ thống tập tin %s bẩn, cần kiểm tra.\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -897,12 +897,12 @@ msgstr ""
 "\n"
 "%6ld inode được dùng (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld vùng được dùng (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -925,7 +925,7 @@ msgstr ""
 "------\n"
 "%6d tập tin\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1049,7 +1049,7 @@ msgstr "quá nhiều inode - tối đa 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "không đủ chỗ trống, cần ít nhất %llu khối"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "Thiết bị: %s\n"
@@ -1226,10 +1226,8 @@ msgstr "%6.2f%% (%+ld byte)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"Lỗi đóng tập tin\n"
+msgid "cannot close file %s"
+msgstr "Không thể mở tập tin '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1341,89 +1339,99 @@ msgstr ""
 "nghĩa là\n"
 "một vài tập tin thiết bị sẽ bị hỏng.\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "Sử dụng: %s [-c | -l tên_tập_tin] [-nXX] [-iXX] /dev/tên [khối]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s đã được gắn, sẽ không tạo hệ thống tập tin ở đây."
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr ""
 "tìm tới khối khởi động không thành công trong write_tables (ghi các bảng)"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "không xóa được rãnh ghi khởi động"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "tìm tới không thành công trong write_tables (ghi các bảng)"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "không thể ghi siêu khối"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "không ghi nhớ được sơ đồ inode"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "không ghi nhớ được sơ đồ vùng"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "không ghi nhớ được các inode"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "tìm kiếm bị lỗi trong ghi_khối"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "ghi nhớ không thành công trong write_block (ghi khối)"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "quá nhiều khối xấu"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "không đủ khối tốt"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "không thể cấp phát vùng đệm cho siêu khối"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "không thể phân phối các bộ đệm cho sơ đồ"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "không thể phân phối các bộ đệm cho inode"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inode\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld khối\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1432,97 +1440,97 @@ msgstr ""
 "Kích cỡ tối đa=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "tìm tới không thành công trong khi thử các khối"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "Giá trị kỳ lạ trong do_check (làm kiểm tra): có thể là lỗi\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "tìm tới không thành công trong check_blocks (kiểm tra khối)"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "khối xấu trước vùng dữ liệ u: không thể tạo ra hệ thống tập tin"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d khối xấu\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "một khối xấu\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "không mở được tập tin của các khối xấu"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "gặp lỗi nhập số khối xấu trên dòng %d\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "không thể đọc tập tin khối xấu"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "kích cỡ inode xấu"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "lỗi strtol: không chỉ ra số khối"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s: lỗi lấy trạng thái"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s: lỗi mở"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s: %s: thiết bị đang bận"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "kích cỡ khối nhỏ hơn kích cỡ rãnh ghi vật lý của %s"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "không thể quyết định kích cỡ của %s"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "sẽ không thử tạo hệ thống tập tin trên '%s'"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "số khối quá nhỏ"
@@ -1854,7 +1862,7 @@ msgstr "nhãn quá dài nên cắt ngắn nó thành « %s »"
 msgid "%s: failed to write label"
 msgstr "%s: lỗi ghi nhãn"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2199,7 +2207,7 @@ msgid "   Logical"
 msgstr "   Lôgíc"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "Không rõ"
 
@@ -2863,12 +2871,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "Câu lệnh nhãn đĩa BSD (m để xem trợ giúp): "
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "%s đầu tiên"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "%s cuối hay +size hay +sizeM hay +sizeK"
@@ -3015,7 +3023,7 @@ msgid "tracks/cylinder"
 msgstr "rãnh/trụ"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "trụ"
 
@@ -3082,12 +3090,12 @@ msgstr "Đã tạo ra số phân vùng lớn nhất cho phép\n"
 msgid "This partition already exists.\n"
 msgstr "Phân vùng này đã có.\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "Cảnh báo : có quá nhiều phân vùng (%d, tối đa là %d).\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3306,7 +3314,7 @@ msgstr "Bạn phải đặt"
 msgid "heads"
 msgstr "đầu đọc"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "rãnh ghi"
 
@@ -3761,7 +3769,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s  Khởi_động    Đầu       Cuối      Khối      Id  Hệ_thống\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "Thiết bị"
 
@@ -3845,7 +3853,7 @@ msgstr "Tổng số rãnh ghi phân phối %llu lớn hơn tối đa %llu\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "%lld rãnh ghi %d-byte không được cấp phát còn lại\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -4003,37 +4011,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "Đang đồng bộ hoá các đĩa.\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "Phân vùng %d không có vùng dữ liệu\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "Điểm bắt đầu dữ liệu mới"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "Câu lệnh nâng cao (m để xem trợ giúp): "
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "Số trụ"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "Số đầu đọc"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "Số rãnh ghi"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "Cảnh báo : thiết lập hiệu số rãnh ghi cho tương thích DOS\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -4046,32 +4054,32 @@ msgstr ""
 "không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "Đĩa %s không chứa một bảng phân vùng hợp lệ\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "Không thể mở %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "không thể mở %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: câu lệnh không biết\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "Nhân này tự tìm kích cỡ rãnh ghi - tùy chọn -b bị bỏ qua\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
@@ -4080,16 +4088,16 @@ msgstr ""
 "Cảnh báo: tùy chọn -b (đặt kích cỡ rãnh ghi) cần sử dụng với một thiết bị "
 "xác định\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "Tìm thấy một nhãn đĩa OSF/1 trên %s, nhập chế độ nhãn đĩa.\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "Câu lệnh (m để xem trợ giúp): "
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4098,16 +4106,16 @@ msgstr ""
 "\n"
 "Tập tin khởi động hiện thời là: %s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "Xin hãy nhập tên của tập tin khởi động mới: "
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "Tập tin khởi động không thay đổi\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4428,9 +4436,10 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\tBạn đã chọn một tên tập tin khởi động lạ.\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "Xin lỗi có thể Bạn thay đổi Tag của phân vùng không rỗng.\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr ""
+"Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Hệ thống.\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4446,7 +4455,7 @@ msgstr ""
 "chứa cả một đĩa mới nằm ngoại lệ. Gõ CÓ nếu bạn chắc chắn muốn đặt\n"
 "thẻ khác cho phân vùng này.\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4640,7 +4649,7 @@ msgstr "Khoảng trống không sử dụng - rãnh ghi 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "Khoảng trống không sử dụng - rãnh ghi %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4649,7 +4658,7 @@ msgstr ""
 "Các phân vùng khác đã chứa cả đĩa.\n"
 "Hãy xóa hay thu nhỏ chúng trước khi thử lại.\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4658,12 +4667,12 @@ msgstr ""
 "Rất khuyên đặt phân vùng thứ ba chiếm toàn bộ đĩa\n"
 "và có kiểu « Toàn đĩa » (Whole disk).\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "Rãnh ghi %d đã được phân phối\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4673,7 +4682,7 @@ msgstr ""
 "Phân vùng thứ 3 không chứa cả ổ đĩa, nhưng các giá trị %d %s đè lên\n"
 "một số phân vùng khác. Các mục đã thay đổi thành %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4682,7 +4691,7 @@ msgstr ""
 "Nếu bạn muốn duy trì một đĩa tương thích với SunOS/Solaris, thì cần để phân\n"
 "vùng này là Cả đĩa (5), bắt đầu từ 0, với %u rãnh ghi\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4696,7 +4705,7 @@ msgstr ""
 "Gõ CÓ nếu bạn chắc chắn muốn đặt phân vùng đó có thẻ\n"
 "82 (vùng trao đổi của Linux): "
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4717,7 +4726,7 @@ msgstr ""
 "Đơn vị = %s trên %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4730,28 +4739,28 @@ msgstr ""
 "Đơn vị = %s trên %d * 512 byte\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s Cờ    Đầu       Cuối    Khối   Id  Hệ thống\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "Số trụ xen kẽ"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "Số rãnh ghi dự phòng mỗi trụ"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "Hệ số xen kẽ"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "Tốc độ quay (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "Số trụ vật lý"
 
@@ -5210,7 +5219,7 @@ msgstr "Đĩa %s: không thể lấy cấu trúc\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "Đĩa %s: không thể lấy kích cỡ\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5221,22 +5230,22 @@ msgstr ""
 "Sử dụng fdisk có thể không có ý nghĩa gì.\n"
 "[Sử dụng tùy chọn --force nếu bạn thực sự muốn]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "Cảnh báo : HDIO_GETGEO nói có %lu đầu đọc\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "Cảnh báo : HDIO_GETGEO nói có %lu rãnh ghi\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "Cảnh báo : BLKGETSIZE/HDIO_GETGEO nói có %lu trụ\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5245,7 +5254,7 @@ msgstr ""
 "Cảnh báo: không giống số sector (%lu) - thường là 63\n"
 "Sẽ nảy sinh vấn đề với tất cả phần mềm sử dụng việc đánh địa chỉ C/H/S.\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5254,7 +5263,7 @@ msgstr ""
 "\n"
 "Đĩa %s: %lu trụ, %lu đầu đọc, %lu rãnh ghi/rãnh\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
@@ -5262,7 +5271,7 @@ msgstr ""
 "%s của phân vùng %s có số đầu đọc không thể có: %lu (phải trong khoảng 0-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
@@ -5271,7 +5280,7 @@ msgstr ""
 "%s của phân vùng %s có số rãnh ghi không thể có: %lu (phải trong khoảng 1-"
 "%lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
@@ -5279,7 +5288,7 @@ msgid ""
 msgstr ""
 "%s của phân vùng %s có số trụ không thể có: %lu (phải trong khoảng 1-%lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5288,12 +5297,12 @@ msgstr ""
 "Id  Tên\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "Đang đọc lại bảng phân vùng ...\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5304,26 +5313,26 @@ msgstr ""
 "hoặc khởi động lại hệ thống ngay bây giờ,\n"
 "trước khi dùng mkfs.\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "Lỗi đóng %s\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s: không có phân vùng như vậy\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "định dạng không nhận ra - sử dụng rãnh ghi\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "định dạng chưa hỗ trợ - sử dụng %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5332,12 +5341,12 @@ msgstr ""
 "Đơn vị = trụ %lu byte, khối 1024 byte, đếm từ %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   Thiết bị Khởi động Đầu     Cuối   #trụ    #khối   Id  Hệ thống\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5346,12 +5355,12 @@ msgstr ""
 "Đơn vị = sector 512 byte, đếm từ %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   Thiết bị Khởi động Đầu     Cuối   #rãnh ghi  Id  Hệ thống\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5360,12 +5369,12 @@ msgstr ""
 "Đơn vị = khối 1024 byte, đếm từ %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   Thiết bị Khởi động Đầu     Cuối    #Khối   Id  Hệ thống\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5374,31 +5383,31 @@ msgstr ""
 "Đơn vị = mebibyte 1048576 byte, khối 1024 byte, đếm từ %d\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   Thiết bị Khởi động Đầu     MiB    #Khối   Id  Hệ thống\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tđầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\tcuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "phân vùng kết thúc trên trụ %ld, vượt quá điểm cuối của đĩa\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "Không tìm thấy phân vùng nào\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5409,51 +5418,41 @@ msgstr ""
 "với C/H/S=*/%ld/%ld (thay vì %ld/%ld/%ld).\n"
 "Tôi sẽ thừa nhận cấu trúc đó cho danh sách này.\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "không có bảng phân vùng nào.\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "kỳ lạ, chỉ có %d phân vùng xác định.\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "Cảnh báo: phân vùng %s có kích cỡ 0 nhưng không được đánh dấu rỗng\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "Cảnh báo: phân vùng %s có kích cỡ 0 và có thể khởi động\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "Cảnh báo: phân vùng %s có kích cỡ 0 và điểm đầu khác 0\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "Cảnh báo: phân vùng %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "không chứa trong phân vùng %s\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "Cảnh báo: các phân vùng %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "và %s đè lên nhau\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "Cảnh báo: phân vùng %d rỗng\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5462,17 +5461,17 @@ msgstr ""
 "Cảnh báo : phân vùng %s chứa một phần của bảng phân vùng (rãnh ghi %lu),\n"
 "và sẽ hủy nó khi đầy\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "Cảnh báo: phân vùng %s bắt đầu tại rãnh ghi 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "Cảnh báo: phân vùng %s kéo dài quá điểm cuối đĩa\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5480,17 +5479,17 @@ msgstr ""
 "Trong số các phân vùng chính, nhiều nhất chỉ có một là mở rộng\n"
 " (mặc dù đây không phải là vấn đề dưới Linux)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "Cảnh báo: phân vùng %s không bắt đầu trên ranh giới trụ\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "Cảnh báo: phân vùng %s không kết thúc trên ranh giới trụ\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5499,7 +5498,7 @@ msgstr ""
 "động. Đây không phải là vấn đề đối với LILO, nhưng MBR của DOS sẽ không\n"
 "khởi động đĩa này.\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5507,7 +5506,7 @@ msgstr ""
 "Cảnh báo: thông thường người dùng chỉ có thể khởi động từ phân vùng\n"
 "chính. LILO không quan tâm đến cờ « có thể khởi động ».\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5516,33 +5515,33 @@ msgstr ""
 "động. Đây không phải là vấn đề đối với LILO, nhưng MBR của DOS sẽ không\n"
 "khởi động đĩa này.\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "đầu"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "phân vùng %s: đầu: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "cuối"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "phân vùng %s: cuối: (c,h,s) mong đợi (%ld,%ld,%ld) tìm thấy (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "phân vùng %s kết thúc trên trụ %ld, vượt quá điểm cuối của đĩa\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5551,7 +5550,7 @@ msgstr ""
 "Cảnh báo: dịch chuyển đầu của phân vùng mởi rộng từ %ld tới %ld\n"
 " (Chỉ với mục đích liệt kê. Không thay đổi nội dung.)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5559,131 +5558,131 @@ msgstr ""
 "Cảnh báo: phân vùng mở rộng không bắt đầu trên ranh giới trụ.\n"
 "DOS và Linux sẽ biên dịch nội dung một cách khác nhau.\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "quá nhiều phân vùng - bỏ qua những phân vùng sau nr (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "cây phân vùng?\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "tìm thấy Trình Quản Lý Đĩa - không thể điều khiển nó\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "Không tìm thấy dấu hiệu DM6 - dừng lại\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "kỳ lạ..., một phân vùng mở rộng với kích cỡ 0?\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "kỳ lại..., một phân vùng BSD với kích cỡ 0?\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: loại bảng phân vùng không nhận ra\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "đã đưa ra cờ -n: Không có gì thay đổi\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "Lỗi ghi rãnh ghi cũ - đang dừng lại\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "Lỗi ghi phân vùng trên %s\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "dòng nhập vào dài hay không đầy đủ - đang thoát\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "lỗi nhập: mong đợi `=' sau vùng %s\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "lỗi nhập: mong đợi ký tự %c sau vùng %s\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "dữ liệu vào không nhận ra: %s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "số quá lớn\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "đuôi bỏ đi sau một số\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "không có chỗ cho mô tả phân vùng\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "không thể tạo phân vùng mở rộng bao quanh\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "quá nhiều vùng nhập vào\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "Không còn chỗ trống\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "Loại không cho phép\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "Cảnh báo: kích cỡ đưa ra (%lu) vượt quá kích cỡ max cho phép (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "Cảnh báo: phân vùng rỗng\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "Cảnh báo: điểm đầu phân vùng xấu (trước %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "cờ có thể khởi động không nhận ra - chọn - hay *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "Đặc điểm phân vùng c,h,s?\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "Phân vùng mở rộng không ở chỗ mong đợi\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "dữ liệu vào xấu\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "quá nhiều phân vùng\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5693,100 +5692,181 @@ msgstr ""
 "<đầu> <kíchthước> <loại [E,S,L,X,hex]> <khởiđộng [-,*]> <c,h,s> <c,h,s>\n"
 "Thông thường bạn chỉ cần chỉ rõ <đầu> và <kíchthước> (và có thể <loại>).\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+msgstr "Sử dụng:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "thiết bị: có dạng /dev/hda hay /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"Tuỳ chọn:\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "tùy chọn nguy hiểm:"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+"    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [hay --show-extended]: đồng thời liệt kê các phân vùng mở rộng\n"
+"                             trong đầu ra hay các mô tả mong đợi cho chúng\n"
+"                             trong đầu vào"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "Sử dụng:"
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s thiết bị\t\t liệt kê phân vùng kích hoạt trên thiết bị\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 "%s thiết bị n1 n2 ... kích hoạt phân vùng n1 ..., bỏ kích hoạt phần còn lại\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An thiết bị\t kích hoạt phân vùng n, bỏ kích hoạt những cái khác\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5799,62 +5879,62 @@ msgstr ""
 "không hỗ trợ GPT. Hãy dùng chương trình GNU Parted.\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "Sử dụng cờ « --force » (bắt buộc) để bãi bỏ sự kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "không lệnh?\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "tổng sô: %llu khối\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "sử dụng: sfdisk --print-id thiết-bị số-phân-vùng\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "sử dụng: sfdisk --change-id thiết-bị số-phân-vùng Id\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "sử dụng: sfdisk --id thiết-bị số-phân-vùng [Id]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "chỉ có thể chỉ ra một thiết bị (ngoại trừ với -l hay -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "không thể mở %s đọc-viết\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "không mở được %s để đọc\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s: %ld trụ, %ld đầu đọc, %ld rãnh ghi/trac\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "Không thể lấy kích cỡ của %s\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "byte kích hoạt sai: 0x%x thay cho 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5862,7 +5942,7 @@ msgstr ""
 "Hoàn thành\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5871,35 +5951,35 @@ msgstr ""
 "Bạn có %d phân vùng chính kích hoạt. Đây không phải là vấn đề cho LILO,\n"
 "nhưng MBR của DOS sẽ chỉ khởi động đĩa có 1 phân vùng kích hoạt.\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "phân vùng %s có id %x và không phải là ẩn\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "Id xấu %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "Đĩa này hiện đang được sử dụng.\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "Lỗi nặng: không thể tìm %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "Cảnh báo: %s không phải là thiết bị khối\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "Đang kiểm tra xem có ai đó đang sử dụng đĩa này không...\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5912,30 +5992,30 @@ msgstr ""
 "đổi\n"
 "trên đĩa này. Sử dụng « --no-reread » để bỏ kiểm tra này.\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "Sử dụng --force để bãi bỏ mọi kiểm tra.\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "OK\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "Tình huống cũ:\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "Phân vùng %d không tồn tại, không thể thay đổi nó\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "Tình huống mới:\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5943,21 +6023,21 @@ msgstr ""
 "Tôi không thích những phân vùng này - không có gì thay đổi.\n"
 "(Nếu bạn thực sự muốn điều này, sử dụng tùy chọn --force.)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "Tôi không thích điều này - bạn nên trả lời No\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "Bạn có hài lòng với điều này? [ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "Bạn có muốn ghi lên đĩa? [ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5966,16 +6046,16 @@ msgstr ""
 "\n"
 "sfdisk: dữ liệu vào kết thúc sớm\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "Đang thoát - không có gì thay đổi\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "Xin hãy trả lời một trng y,n,q\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5984,7 +6064,7 @@ msgstr ""
 "Viết thành công bảng phân vùng mới\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -6015,26 +6095,28 @@ msgstr "Đang đồng bộ hoá các đĩa.\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s thành công.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s bị lỗi.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "CẢNH BÁO : không mở được %s: %s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "CẢNH BÁO : gặp định dạng sai trên dòng %d của %s\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -6046,37 +6128,37 @@ msgstr ""
 "\ttập tin /etc/fstab càng sớm càng có thể.\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck: %s: không tìm thấy\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s: đợi: không có tiến trình con nào nữa ?!?\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "Cảnh báo... %s cho thiết bị %s đã thoát với tín hiệu %d.\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s: %s: trạng thái là %x, không bao giờ nên xảy ra.\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "Đã kết thúc với %s (trạng thái thoát %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s: Lỗi %d trong khi thực hiện fsck.%s cho %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6085,7 +6167,7 @@ msgstr ""
 "Hoặc tất cả hoặc không có kiểu hệ thống tập tin được gửi cho « -t »\n"
 "phải có tiền tố « no » hay « ! ».\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
@@ -6093,33 +6175,33 @@ msgstr ""
 "%s: đang bỏ qua dòng sai trong tập tin « /etc/fstab »:\n"
 "điểm lắp đóng kết có số thứ tự lần chạy fsck khác số không\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s: đang bỏ qua thiết bị không tồn tại\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck: không thể kiểm tra %s: fsck.%s không tìm thấy\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "Đang kiểm tra tất cả các hệ thống tập tin.\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--đang đợi-- (lần chạy %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6127,58 +6209,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s: quá nhiều thiết bị\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "Không mở được %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "/proc được gắn kết không?\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "Phải là người chủ (root) để quét tìm hệ thống tập tin tương ứng: %s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "Không tìm thấy hệ thống tập tin tương ứng: %s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s: quá nhiều đối số\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6197,33 +6279,77 @@ msgstr "tùy chọn dài rỗng sau -l hay tham số --long"
 msgid "unknown shell after -s or --shell argument"
 msgstr "trình bao không rõ sau -s hay tham số --shell"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [tùychọn] -o|--options chuỗi_tùy_chọn [tùy_chọn] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
 msgstr ""
+"  -a, --alternative            Cho phép tùy chọn dài bắt đầu với một - đơn\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   Hướng dẫn sử dụng nhỏ này\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=tùychọndài   Tùy chọn dài cần nhận ra\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=tên_chương_trình          Báo cáo lỗi dưới tên này\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=chuỗi_tùy_chọn      Các tùy chọn ngắn cần nhận ra\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  Tắt bỏ báo cáo lỗi bằng getopt(3)\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           Không có kết quả ra thông thường\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=trình_bao            Đặt quy ước trích dẫn trình bao\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   Thử phiên bản getopt(1)\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 Không trích dẫn kết quả ra\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                In ra thông tin phiên bản\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "thiếu đối số chuỗi_tùy_chọn"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "lỗi nội bộ, hãy liên hệ với tác giả."
 
@@ -6683,92 +6809,110 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "Không đặt được giá trị khởi đầu trong nhân.\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"Tuỳ chọn:\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
 "       báo hwclock biết kiểu alpha bạn có (xem hwclock(8))\n"
 "\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s: không thể kết nối để kiểm tra chặt chẽ hệ thống\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "lỗi phân tích PID"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s lấy các tham số không tùy chọn.  Bạn đã cung cấp %d.\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6777,7 +6921,7 @@ msgstr ""
 "Bạn phải chỉ ra nhiều hàm.\n"
 "Bạn chỉ có thể thực hiện một hàm mỗi lần.\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
@@ -6786,7 +6930,7 @@ msgstr ""
 "%s: Các tùy chọn « --utc » và « --localtime » loại trừ lẫn nhau.  Bạn lại "
 "đưa ra cả hai.\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
@@ -6795,7 +6939,7 @@ msgstr ""
 "%s: Các tùy chọn « --adjust » và « --noadjust » loại trừ lẫn nhau.  Bạn lại "
 "đưa ra cả hai.\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
@@ -6804,30 +6948,30 @@ msgstr ""
 "%s: Các tùy chọn « --adjfile » và « --noadjfile » loại trừ lẫn nhau.  Bạn "
 "lại đưa ra cả hai.\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 "%s: Với « --noadjfile », bạn phải chỉ ra « --utc » hoặc « --localtime »\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "Không có thời gian set-to nào có thể sử dụng. Không thể đặt đồng hồ\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr ""
 "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Phần cứng.\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr ""
 "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi Đồng hồ Hệ thống.\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
@@ -6835,13 +6979,13 @@ msgstr ""
 "Rất tiếc, nhưng chỉ người dùng root mới có thể thay đổi khởi đầu củaĐồng hồ "
 "Phần cứng trong nhân.\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 "Không thể truy cập tới Đồng hồ Phần cứng qua một phương pháp không rõ.\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -7026,7 +7170,7 @@ msgid "failed to read mtab"
 msgstr "không đọc được: %s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr "lỗi sơ khởi bộ lặp lại libmount"
 
@@ -7073,45 +7217,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7120,27 +7304,27 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem ipcmk(1).\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount: gắn không thành công"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "lỗi phân tích PID"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "lỗi lấy các thuộc tính về PID %d"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "lỗi phân cấp vùng đệm ra"
@@ -7227,7 +7411,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s: PAM thất bại nên hủy bỏ : %s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "Mật khẩu: "
 
@@ -7675,47 +7859,48 @@ msgstr "dòng nhập vào THỪA"
 msgid "too many bare linefeeds."
 msgstr "quá nhiều dòng nhập vào trống\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "Hết thời gian chờ đăng nhập sau %d giây\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "Đăng nhập lần cuối: %.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "từ %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "trên %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "lỗi ghi vào đầu ra tiêu chuẩn"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "LỖI ĐĂNG NHẬP TỪ %s, %s"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "LỖI ĐĂNG NHẬP TRÊN %s, %s"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d LẦN KHÔNG ĐĂNG NHẬP ĐƯỢC TỪ %s, %s"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d LẦN KHÔNG ĐĂNG NHẬP ĐƯỢC TRÊN %s, %s"
@@ -7745,7 +7930,7 @@ msgstr "mount: không đủ quyền hạn"
 msgid "setuid failed"
 msgstr "setuid() bị lỗi"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "exec %s bị lỗi"
@@ -7790,8 +7975,8 @@ msgstr "%s: Không đặt được văn cảnh cho %s"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s: không mở khóa được %s: %s (mọi thay đổi vẫn còn trong %s)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "lỗi phân nhánh"
 
@@ -7843,24 +8028,21 @@ msgstr "giá trị năm bị sai: hãy dùng 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "sử dụng: cal [-13smjyV] [[[ngày] tháng] năm]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7971,32 +8153,32 @@ msgstr " Bỏ"
 msgid "failed to add line to output"
 msgstr "không thêm được dòng vào kết xuất"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "lỗi phân tích cú pháp ở dòng: "
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "lỗi sơ khởi tab libmount"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "không đọc được: %s"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "lỗi sơ khởi tab libmount"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc() bị lỗi"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -8013,76 +8195,74 @@ msgstr ""
 " %1$s [tuỳ_chọn] <thiết_bị> <điểm_lắp>\n"
 " %1$s [tuỳ_chọn] [--source <thiết_bị>] [--target <điểm_lắp>]\n"
 
-#: misc-utils/findmnt.c:770
-#, fuzzy, c-format
+#: misc-utils/findmnt.c:772
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
-"\n"
-"Tuỳ chọn:\n"
-" -s, --fstab            tìm kiếm trong bảng tĩnh của hệ thống tập tin\n"
-" -m, --mtab          tìm kiếm trong bảng của hệ thống tập tin đã lắp\n"
-" -k, --kernel     tìm kiếm trong bảng hạt nhân của hệ thống tập tin đã lắp "
-"(mặc định)\n"
-"\n"
-" -c, --canonicalize     làm cho hợp nguyên tắc các đường dẫn được in ra\n"
-" -d, --direction <từ>    hướng tìm kiếm: « forward » (tiếp) hay « backward "
-"» (lùi)\n"
-" -e, --evaluate         in ra mọi THẺ (NHÃN/UUID) được tính\n"
-" -f, --first-only       chỉ in ra hệ thống tập tin được tìm đầu tiên\n"
-" -h, --help             in ra trợ giúp này\n"
-" -i, --invert           đảo ngược cách khớp\n"
-" -l, --list                xuất theo định dạng danh sách\n"
-" -n, --noheadings       đừng in ra phần đầu\n"
-" -u, --notruncate         đừng cắt ngắn chuỗi trong cột\n"
-" -O, --options <danh_sách>   hạn chế tập hợp các hệ thống tập tin theo tuỳ "
-"chọn lắp\n"
-" -o, --output <danh_sách>    xuất cột\n"
-" -r, --raw              xuất theo định dạng thô\n"
-" -a, --ascii            định dạng cây bằng ký tự ASCII\n"
-" -t, --types <danh_sách>     hạn chế tập hợp các hệ thống tập tin theo kiểu "
-"HTTT\n"
-" -S, --source <chuỗi>  thiết bị, LABEL= (nhãn là) hay UUID=thiết_bị\n"
-" -T, --target <chuỗi>    điểm lắp\n"
-"\n"
-
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "Những câu lệnh có :\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
@@ -8091,21 +8271,21 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem findmnt(1).\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr "các tuỳ chọn loại từ lẫn nhau"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr "không rõ hướng « %s »"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "lỗi phân tích PID"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
@@ -8113,20 +8293,20 @@ msgstr ""
 "không thể sử dụng cả hai tuỳ chọn « --target » (đích) và « --source "
 "» (nguồn) với một yếu tố dòng lệnh mà không thể là một tuỳ chọn"
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr "lỗi sơ khởi vùng nhớ tạm libmount"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr "lỗi sơ khởi bảng kết xuất"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr "lỗi sơ khởi cột kết xuất"
 
@@ -8150,12 +8330,12 @@ msgstr "%s: không thể tìm thấy tiến trình « %s »\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s: tín hiệu không rõ %s; tín hiệu có thể dùng:\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "sử dụng: %s [ -s tín_hiệu | -p ] [ -a ] pid ...\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ tín_hiệu ]\n"
@@ -8175,85 +8355,84 @@ msgstr "ổ cắm: %s.\n"
 msgid "connect %s"
 msgstr "kết nối: %s.\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "ổ cắm"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "kết nối"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "Sử dụng: %s [các_tùy_chọn]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(Tập tin tiếp theo: %s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "lỗi phân tích mức ưu tiên"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "Giá trị vượt quá giới hạn.\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger: không rõ tên khả năng: %s.\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger: không rõ tên quyền ưu tiên: %s.\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8393,7 +8572,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s: lỗi tìm nơi tới nhãn trao đổi"
 
 #: misc-utils/lsblk.c:809
@@ -8411,12 +8590,13 @@ msgstr "%s: không mở được"
 msgid "failed to parse list '%s'"
 msgstr "lỗi phân tích cú pháp của %s %s"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8424,7 +8604,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8447,7 +8627,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8456,33 +8636,33 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem swaplabel(8).\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "Sử dụng: %s [tùy_chọn]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "Không mở được %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "Nhận %d byte từ %s\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "không thực hiện được %s"
@@ -8502,26 +8682,15 @@ msgstr "không thể lấy trạng thái về « %s »"
 msgid "%s - No such file or directory\n"
 msgstr "%s: yêu cầu bộ mô tả tập tin, tập tin hay thư mục\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "Sử dụng: %s [các_tuỳ_chọn] tên_đường_dẫn [tên_đường_dẫn ...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"Tuỳ chọn:\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8540,8 +8709,7 @@ msgstr ""
 " -n, --nosymlinks    đừng theo liên kết tượng trưng\n"
 " -v, --vertical      sắp hàng theo chiều dọc các chế độ và chủ\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8549,12 +8717,12 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem namei(1).\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "Tham số --date quá dài\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s: vượt quá hạn ngạch số các liên kết tượng trưng"
@@ -8564,166 +8732,161 @@ msgstr "%s: vượt quá hạn ngạch số các liên kết tượng trưng"
 msgid "renaming %s to %s failed"
 msgstr "%s: thay đổi tên %s thành %s không thành công: %s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "đối số sai"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "ghi"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "đếm số lần đọc"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "chiều dài đáp ứng sai"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "Không mở/tạo được %s: %s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "Không khoá được %s: %s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "Trình nền uuidd đã chạy với PID %s\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "Không thể tạo ổ cắm luồng UNIX: %s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "Không thể đóng kết ổ cắm UNIX %s: %s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "Không thể lắng nghe trên ổ cắm UNIX %s: %s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "Gặp lỗi khi đọc từ ứng dụng khách, dài = %d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "thao tác %d, số gửi đến = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr "thao tác %d\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "UUID thời gian đã tạo ra: %s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "UUID ngẫu nhiên đã tạo ra: %s\n"
 
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "UUID thời gian đã tạo ra %s và %d theo sau\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "UUID thời gian đã tạo ra %s và %d theo sau\n"
 
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "%d UUID đã tạo ra:\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "%d UUID đã tạo ra:\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "Thao tác không hợp lệ %d\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "Máy phục vụ đáp ứng với chiều dài bất thường %d\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "Số sai: %s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "Gặp lỗi khi gọi trình nền uuidd (%s): %s\n"
 
-#: misc-utils/uuidd.c:546
-#, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s và %d UUID theo sau\n"
+#: misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s và %d UUID theo sau\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "Danh sách các UUID:\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "Không thể buộc kết thúc uuidd đang chạy với PID %d: %s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "Đã buộc kết thúc uuidd chạy với PID %d\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8731,29 +8894,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8786,29 +8948,31 @@ msgid "%s: write failed"
 msgstr "%s: lỗi ghi"
 
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd byte ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] bị xoá ở khoảng chênh 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "sai xác định giá trị chênh « %s »"
 
-#: misc-utils/wipefs.c:306
+#: misc-utils/wipefs.c:305
 #, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 " -a, --all           xoá mọi chuỗi ma thuật (CẨN THẬN !!)\n"
 " -h, --help          hiển thị trợ giúp này\n"
@@ -8817,7 +8981,7 @@ msgstr ""
 " -p, --parsable      in ra theo định dạng có thể phân tích, thay cho định "
 "dạng có thể in ấn\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8826,11 +8990,11 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem wipefs(8).\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "« --offset » và « --all » loại từ lẫn nhau"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8922,63 +9086,63 @@ msgstr "lỗi thay đổi chủ sở hữu của %s: %s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "không đổi tên được %s thành %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s: thư mục « /dev » không tồn tại."
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop: không thể đặt khả năng trên thiết bị %s: %s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ", bù %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ", hạn_cỡ %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ", mã_hoá %s (kiểu %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ", bù %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ", dạng mã hóa %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop: không lấy được thông tin trên thiết bị %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop: không mở được thiết bị %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s: không có quyền xem /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s: không tìm thấy thiết bị vòng lặp nào còn trống"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8988,57 +9152,55 @@ msgstr ""
 "       về thiết bị vòng lặp? (Nếu vậy, hãy biên dịch lại hoặc thử `modprobe "
 "loop'.)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "Không đủ bộ nhớ khi đọc cụm từ mật khẩu"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "cảnh báo : %s đã liên quan đến %s\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "cảnh báo : %s: được bảo vệ chống ghi nên đặt chỉ-đọc.\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "Không khóa được vào bộ nhớ, đang thoát.\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD bị lỗi: %s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu): thành công\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s): thành công\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop: không xóa được thiết bị %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 "Phiên bản mount này được biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch "
 "lại.\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -9046,7 +9208,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "Sử dụng:\n"
@@ -9059,19 +9221,17 @@ msgstr ""
 "tập tin này\n"
 " %1$s [ tuỳ_chọn ... ] {-f|--find|TB_vòng_lặp} <tập_tin>        thiết lập\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -9087,32 +9247,32 @@ msgstr ""
 " -v | --verbose          \t\tchế độ chi tiết\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "%s: sai xác định giá trị chênh « %s »"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "%s: sai xác định giới hạn kích cỡ « %s »"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "Thiết bị vòng lặp là %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "vòng lặp bị ăn cắp=%s... nên thử lại\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s: %s: thiết bị đang bận"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "Biên dịch không hỗ trợ vòng lặp. Xin hãy biên dịch lại.\n"
@@ -9706,14 +9866,17 @@ msgstr "lỗi (bug) trong lời gọi xstrndup"
 msgid "not enough memory"
 msgstr "không đủ bộ nhớ"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "Tham số <đặc biệt>:\n"
@@ -9723,131 +9886,116 @@ msgstr ""
 " <tập_tin>                               \ttên của tập tin cần dùng\n"
 "\n"
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Sử dụng:\n"
-" %1$s -a [-e] [-v] [-f]         bật tất cả các vùng trao đổi từ /etc/fstab\n"
-" %1$s [-p ưu_tiên] [-v] [-f] <đặc_biệt>  bật vùng trao đổi đưa ra\n"
-" %1$s -s                            hiển thị lược sử về cách sử dụng vùng "
-"trao đổi\n"
-" %1$s -h                            hiển thị trợ giúp\n"
-" %1$s -V                            hiển thị phiên bản\n"
-"\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"Sử dụng:\n"
-" %1$s -a [-v]             \t\ttắt mọi trao đổi\n"
-" %1$s [-v] <đặc_biệt>       \ttắt trao đổi đã cho\n"
-" %1$s -h                           \thiển thị trợ giúp\n"
-" %1$s -V                           \thiển thị phiên bản\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s: gặp định dạng tập tin bất thường"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s: đang sơ khởi lại vùng trao đổi."
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "execv bị lỗi"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "waitpid bị lỗi"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s: lseek bị lỗi"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s: lỗi ghi chữ ký"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 "%s: tìm thấy chữ ký trao đổi: phiên bản %d, kích cỡ trang %d, thứ tự byte %s"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "khác"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "giống nhau"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s: có quyền không bảo mật %04o, đề nghị dùng %04o."
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s: có quyền không bảo mật %04o, đề nghị dùng %04o."
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s: đang bỏ qua — có vẻ là nó bị lỗ."
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s: lỗi lấy kích cỡ"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s: lỗi đọc phần đầu vùng trao đổi"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 "%s: kích cỡ trang=%d, kích cỡ vùng trao đổi=%llu, kích cỡ thiết bị=%llu"
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr "%s: last_page 0x%08llx lớn hơn kích cỡ thật của vùng trao đổi"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s: kích cỡ trang định dạng trao đổi không tương ứng."
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
@@ -9855,36 +10003,36 @@ msgstr ""
 "%s: kích cỡ trang định dạng trao đổi không tương ứng. (Dùng --fixpgsz để sơ "
 "khởi lại nó.)"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr "%s: phát hiện dữ liệu ngưng phần mềm. Đang ghi lại chữ ký trao đổi."
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s trên %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s swapon bị lỗi"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "không tìm thấy thiết bị cho %s"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "Không phải siêu người dùng.s"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s swapoff bị lỗi"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -10169,7 +10317,7 @@ msgstr "Phân vùng được chọn %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10229,19 +10377,13 @@ msgstr "        (%s phát hiện được bảng phân vùng). "
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "Đĩa %s không chứa một bảng phân vùng hợp lệ\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10252,21 +10394,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "Những câu lệnh có :\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10275,27 +10416,27 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem « setarch(8) ».\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "các tuỳ chọn loại từ lẫn nhau"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "lỗi phân tích mức ưu tiên"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "các tuỳ chọn loại từ lẫn nhau"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "lỗi sơ khởi vùng đệm dòng\n"
@@ -10450,7 +10591,7 @@ msgstr "lỗi đặt chính sách của PID %d"
 msgid "failed to set pid %d's policy"
 msgstr "lỗi đặt chính sách của PID %d"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "lỗi thực hiện %s"
@@ -10738,7 +10879,7 @@ msgstr "%s: %ld ngưỡng mặc định và %ld thời gian chờ mặc định\
 msgid "Can't set signal handler"
 msgstr "Không lấy được trình điều khiển tín hiệu"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday (lấy giờ) không thành công"
 
@@ -10747,7 +10888,7 @@ msgstr "gettimeofday (lấy giờ) không thành công"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "Không CYGETMON được trên %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10755,12 +10896,12 @@ msgstr ""
 "%s: %lu ngắt, %lu/%lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu "
 "bây giờ\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f int/giây; %f rec, %f gửi (kýtự/giây)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10768,7 +10909,7 @@ msgstr ""
 "%s: %lu ngắt, %lu ký tự; fifo: %lu ngưỡng, %lu thời hạn, %lu tối đa, %lu bây "
 "giờ\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f int/giây; %f rec (kýtự/giây)\n"
@@ -10860,130 +11001,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "không thể chạy trong nền"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"Sử dụng: %s [các_tùy_chọn]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "lỗi phân tích cú pháp của %s %s"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "không rõ cột: %s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "lỗi phân tích cú pháp của %s %s"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "không rõ hướng « %s »"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync bị lỗi"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "lỗi ghi: %s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "lỗi phân tích cú pháp của %s %s"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "không lệnh?\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctl bị lỗi"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Sử dụng: %s [tùy_chọn ...] <tên_tập_tin>\n"
-"\n"
-"Tuỳ chọn:\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10995,7 +11113,7 @@ msgstr ""
 " -o, --offset <SỐ>  khoảng chênh cấp phát, theo byte\n"
 " -l, --length <SỐ>  chiều dài cấp phát, theo byte\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -11004,31 +11122,31 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem fallocate(1).\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "chưa xác định đối số chiều dài"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "sai xác định giá trị chiều dài"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "sai xác định giá trị chênh"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "chưa xác định tên tập tin."
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr "gặp số các đối số bất thường"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "chế độ giữ kích cỡ (tuỳ chọn « -n ») không được hỗ trợ"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s: fallocate bị lỗi"
@@ -11036,18 +11154,24 @@ msgstr "%s: fallocate bị lỗi"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "Sử dụng: %1$s [-sxun][-w #] fd#\n"
 "       %1$s [-sxon][-w #] tập_tin [-c] lệnh...\n"
@@ -11063,55 +11187,51 @@ msgstr ""
 "  -h  --help       Hiển thị trợ giúp này\n"
 "  -V  --version    Hiển thị phiên bản\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s: %s: yêu cầu chính sách một đối số lệnh\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: không mở được tập tin sự khoá %s: %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s: số sai: %s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s: yêu cầu bộ mô tả tập tin, tập tin hay thư mục\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s: lỗi phân nhánh: %s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "Sử dụng: %s [tùy_chọn ...] <điểm_lắp>\n"
 "\n"
 "Tuỳ chọn:\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
+#, fuzzy
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 " -h, --help          trợ giúp này\n"
 " -f, --freeze        làm đông đặc hệ thống tập tin\n"
 " -u, --unfreeze      bỏ đông đặc hệ thống tập tin\n"
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -11119,36 +11239,35 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem fsfreeze(8).\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr "chưa xác định hành động"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr "chưa xác định tên tập tin"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s: fstat bị lỗi"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr "%s: không phải là một thư mục"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr "%s: không đông đặc được"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s: không bỏ đông đặc được"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -11157,8 +11276,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11166,98 +11285,87 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem findmnt(1).\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "lỗi phân tích cú pháp của %s %s"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "lỗi phân tích cú pháp của %s %s"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "lỗi đọc tập tin đếm thời gian %s"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "chưa xác định hành động"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "%s: không phải là một thư mục"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s: lỗi ghi"
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:84
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
-"\n"
-"Sử dụng: %s [các_tùy_chọn]\n"
-"\n"
 
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <kích_cỡ>     tạo đoạn nhớ dùng chung có kích cỡ này\n"
 "  -S <số>    tạo mảng cờ hiệu có số mục này\n"
 "  -Q            tạo hàng đợi thông điệp\n"
 "  -p <chế_độ>     quyền hạn của tài nguyên (mặc định 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem ipcmk(1).\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "lỗi tạo vùng nhớ dùng chung"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "Mã số vùng nhớ dùng chung: %d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "lỗi tạo hàng đợi thông điệp"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "Mã số hàng đợi thông điệp: %d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "lỗi tạo cờ hiệu"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "Mã số cờ hiệu: %d\n"
@@ -11769,8 +11877,8 @@ msgstr ""
 "Đoạn vùng nhớ chia sẻ shmid=%d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11779,8 +11887,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "chế_độ=%#o\tquyền_truy_cập=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "byte=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11812,8 +11920,8 @@ msgstr ""
 "Hàng đợi Thông điệp msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tchế_độ=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11845,8 +11953,8 @@ msgstr ""
 "Dãy cờ hiệu semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11894,17 +12002,15 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "cờ iflag sai: %s"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "Sử dụng: %s [ -dhV78neo12 ] [ -s <tốc_độ> ] [ -i [-]<iflag> ] <ldisc> "
 "<thiết_bị>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11912,7 +12018,7 @@ msgstr ""
 "\n"
 "Các tên <ldisc> đã biết đến:\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
@@ -11920,50 +12026,50 @@ msgstr ""
 "\n"
 "Các tên <iflag> đã biết đến:\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "tốc độ sai: %s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach từ %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "tùy chọn sai"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "kỷ luật dòng sai: %s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s không phải là dòng nối tiếp"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "không thể lấy thuộc tính thiết bị về %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "tốc độ %d không được hỗ trợ"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "không thể đặt các thuộc tính thiết bị cho %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "không thể đặt kỷ luật dòng"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "không thể chạy trong nền"
 
@@ -12120,15 +12226,14 @@ msgstr "Vùng nhớ tạm %s:"
 msgid "NUMA node%d CPU(s):"
 msgstr "CPU nút%d NUMA:"
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "Trình bổ trợ thông tin kiến trúc CPU\n"
 "\n"
@@ -12137,26 +12242,22 @@ msgstr ""
 "được\n"
 "  -s, --sysroot  dùng thư mục làm gốc hệ thống mới\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12165,12 +12266,12 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem ipcmk(1).\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s: không phải là một thư mục"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s đã được gắn.\t "
@@ -12206,46 +12307,44 @@ msgstr ""
 "\t -n            tắt bỏ việc tự động tìm ra thứ tự byte\n"
 "\t -V            in ra phiên bản và thoát\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile: lỗi ghi %s: %s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 "Giả sử thứ tự byte đảo lộn. Dùng « -n » để ép buộc theo thứ tự byte sở hữu.\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "Sampling_step: %i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i): sai dòng ánh xạ\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s: không tìm thấy \"_stext\" trong %s\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s: địa chỉ của xác lập nằm ngoài phạm vi. Tập tin ánh xạ sai?\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "tổng"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12265,10 +12364,7 @@ msgstr ""
 "version\tphiên bản\n"
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12277,8 +12373,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12286,72 +12382,61 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem namei(1).\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "thay đổi ưu tiên từ %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "không rõ cột: %s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "giá trị thời gian chờ xấu: %s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "người dùng"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "Lỗi đặt cá tính thành %s"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "Lỗi đặt cá tính thành %s"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: mức độ ưu tiên cũ %d, mới %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"Sử dụng: %s [tùy_chọn ...] <thiết_bị>\n"
-"\n"
-"Tuỳ chọn:\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "sử dụng: %s [tùy_chọn]\n"
 "    -d | --device <thiết_bị>    chọn thiết bị rtc (rtc0|rtc1|...)\n"
@@ -12364,8 +12449,8 @@ msgstr ""
 "    -v | --verbose            in ra chi tiết\n"
 "    -V | --version            hiển thị số thứ tự phiên bản\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12373,162 +12458,162 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem taskset(1).\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "đọc thời gian RTC"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "đọc thời gian hệ thống"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "chuyển đổi thời gian RTC"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "để đồng hồ báo thức RTC"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "bật đồng hồ báo thức RTC"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "để đồng hồ báo thức RTC kích hoạt lại"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "bật đồng hồ báo thức RTC"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "chuyển đổi thời gian RTC"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "%s: tình trạng ngưng không nhận ra: %s\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "lỗi phân tích cú pháp của %s %s"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "lỗi phân tích PID"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s: giả sử RTC dùng UTC ...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "Sử dụng thời gian UTC.\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "Sử dụng thời gian địa phương.\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s: phải cung cấp thời gian kích hoạt lại\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s không có hiệu lực cho dữ kiện kích hoạt lại\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "báo thức %ld, giờ_hệ_thống %ld, giờ_RTC %ld, giây %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, fuzzy, c-format
 msgid "time doesn't go backward to %s"
 msgstr "%s: thời gian không chạy ngược về %s\n"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%s: kích hoạt lại sau « %s » dùng %s ở %s\n"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%s: kích hoạt lại sau « %s » dùng %s ở %s\n"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr "chế độ ngưng: không; đang rời\n"
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr "chế độ ngưng: bị tắt; đăng thực hiện %s\n"
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "lỗi thực hiện %s"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr "chế độ ngưng: đã bật; đang đọc RTC\n"
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "lỗi đọc: %s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr "chế độ ngưng: vô hiệu hoá; đang tắt báo động\n"
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, fuzzy, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr "chế độ ngưng: vô hiệu hoá; đang tắt báo động\n"
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr "chế độ ngưng: %s; đang ngưng chạy hệ thống\n"
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 #, fuzzy
 msgid "disable rtc alarm interrupt failed"
 msgstr "tắt khả năng gián đoạn của đồng hồ báo thức RTC"
@@ -12602,16 +12687,16 @@ msgstr ""
 "%s: %s\n"
 "Thử lệnh trợ giúp « %s --help » để xem thông tin thêm.\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s: kiến trúc không nhận ra"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "Không đủ đối số"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "Lỗi đặt cá tính thành %s"
@@ -12694,20 +12779,19 @@ msgstr "%s đang dùng IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s đang dùng khả năng trưng cầu\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "Sử dụng: %s [tuỳ_chọn ...] <chương_trình> [đối_số ...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "Chạy chương trình có một số miền tên không chia sẻ từ cha\n"
 "\n"
@@ -12717,8 +12801,7 @@ msgstr ""
 "  -i, --ipc         bỏ chia sẻ miền tên System V IPC\n"
 "  -n, --net         bỏ chia sẻ miền tên network\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12726,147 +12809,147 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem unshare(1).\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshare bị lỗi"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "không đặt được mã số nhóm (GID)"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "không đặt được mã số người dùng (UID)"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s: không thực hiện được %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "lỗi: chuyển đổi thư mục làm việc sang %s."
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s: không thể tìm thấy tiến trình « %s »\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s: không thực hiện được %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "lỗi phân cấp vùng đệm ra"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "giá trị thời gian chờ xấu: %s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "Không đủ đối số"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "lỗi phân cấp vùng đệm ra"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "tốc độ xấu: %s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "quá nhiều tốc độ luân phiên"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "không mở được /dev/%s như một đầu vào tiêu chuẩn (stdin): %m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: không phải thiết bị ký tự"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s: không mở được đọc/viết"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s: vấn đề khi dup: %m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "loại: %s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s: đọc: %m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s: thừa dữ liệu vào"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12878,72 +12961,66 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "người dùng"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "người dùng"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "Sử dụng: %s [các_tùy_chọn]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "unshare bị lỗi"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "lỗi lấy trạng thái: %s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "là y (có)\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "là n (không)\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "lỗi tạo cờ hiệu"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "cờ iflag sai: %s"
@@ -12959,52 +13036,46 @@ msgstr ""
 "Hãy dùng `%s [tùy chọn] %s' nếu thực sự muốn sử dụng nó.\n"
 "Văn lệnh chưa chạy.\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "không thể mở tập tin đếm thời gian %s"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "Văn lệnh đã khởi chạy, tập tin là %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "Văn lệnh đã khởi chạy trên %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: không thể ghi tập tin văn lệnh, lỗi: %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -13013,79 +13084,76 @@ msgstr ""
 "\n"
 "Hoàn tất chạy văn lệnh trên %s"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "Hoàn tất chạy văn lệnh, tập tin là %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty không thành công\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "Ngoài pty\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <tập_tin_đếm_thời_gian> [<bản_đánh máy> [<số_chia>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "mong đợi con số, còn nhận « %s »"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "số chia « %s »"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "lỗi ghi vào đầu ra tiêu chuẩn"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "gặp kết thúc tập tin bất thường trên %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "lỗi đọc tập tin bản đánh máy %s"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "gặp số các đối số bất thường"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "không thể mở tập tin bản đánh máy %s"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "lỗi đọc tập tin đếm thời gian %s"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "tập tin đếm thời gian %s: %lu: định dạng bất thường"
@@ -13096,50 +13164,47 @@ msgid "Argument error."
 msgstr "%s: Lỗi đối số, sử dụng\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -13148,61 +13213,61 @@ msgstr ""
 "\n"
 "Để tìm thêm thông tin, xem swaplabel(8).\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "không thể buộc rỗng\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "không thể buộc bỏ rỗng\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "không thể lấy trạng thái rỗng\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "không (bỏ) đặt được chế độ tiết kiệm nguồn điện\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "không thể mở thiết bị %s để ghi\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "lỗi klogctl: %s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "Lỗi ghi screendump (đổ màn hình)\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "Không đọc được %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s: $TERM (thiết bị cuối) chưa định nghĩa.\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s: tín hiệu không rõ %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13230,144 +13295,149 @@ msgstr "fork: %s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "tùy chọn sai"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "giá trị thời gian chờ xấu: %s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: không mở được tập tin tạm thời.\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "không đặt được mã số người dùng (UID)"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "Không thể lấy kích cỡ đĩa"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "Thông báo Toàn thể từ %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s: sẽ không đọc %s - sử dụng stdin.\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s: fstat bị lỗi"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "lỗi đọc: %s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "Sử dụng: %s [các_tuỳ_chọn] tên_đường_dẫn [tên_đường_dẫn ...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write: không tìm thấy tên tty của bạn\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write: quyền ghi nhớ của bạn đã tắt.\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write: %s chưa đăng nhập vào trên %s.\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write: %s tắt không dùng thông báo trên %s\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write: %s chưa đăng nhập vào\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write: %s tắt không dùng thông báo\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write: %s đăng nhập nhiều hơn một lần, đang ghi nhớ vào %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "Dòng nhập vào quá dài.\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "Tin nhắn từ %s@%s (như %s) trên %s lúc %s ..."
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "Tin nhắn %s@%s tên %s lúc %s ..."
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "lỗi calloc"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"Sử dụng: %s [các_tùy_chọn]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13551,7 +13621,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13754,7 +13824,7 @@ msgstr ""
 "\n"
 "Không tìm thấy mẫu tìm kiếm\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "Không tìm thấy mẫu tìm kiếm"
 
@@ -13819,7 +13889,7 @@ msgstr "hexdump: định dạng xấu {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump: ký tự chuyển đổi xấu %%%s.\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13872,7 +13942,7 @@ msgstr ""
 "Xem pg(1) để tìm thêm thông tin.\n"
 "-------------------------------------------------------\n"
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
@@ -13880,81 +13950,81 @@ msgstr ""
 "%s: Sử dụng: %s [-số] [-p chuỗi] [-cefnrs] [+dòng] [+/pattern/] "
 "[các_tậptin]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s: tùy chọn yêu cầu một tham số -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s: tùy chọn không cho phép -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...nhảy về trước\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...nhảy quay lại\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "Không có tập tin tiếp theo"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "Không có tập tin trước"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s: Lỗi đọc từ tập tin %s\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s: EOF (Kết thúc) không mong đợi trong tập tin %s\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s: Lỗi không rõ trong tập tin %s\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s: Không tạo được tập tin tạm thời (tempfile)\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "Lỗi RE: "
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(Kết thúc tập tin)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "Không có chuỗi tìm kiếm ghi nhớ nào"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "Không mở được "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "đã ghi"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ": !câulệnh không cho phép trong chế độ rflag.\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() không thành công, hãy thử lại sau\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(Tập tin tiếp theo: "
 
@@ -14026,8 +14096,8 @@ msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -14043,39 +14113,212 @@ msgstr "lỗi phân tích cú pháp của %s %s"
 msgid "no input file specified"
 msgstr "chưa xác định tên tập tin"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "có vấn đề khi đọc terminfo"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "Chuỗi thoát không rõ trong dữ liệu vào: %o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "Dòng nhập vào quá dài.\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "Sử dụng:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Lỗi đóng tập tin\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "Xin lỗi có thể Bạn thay đổi Tag của phân vùng không rỗng.\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "Cảnh báo: phân vùng %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "Cảnh báo: các phân vùng %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "và %s đè lên nhau\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "thiết bị: có dạng /dev/hda hay /dev/sda"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -s, --fstab            search in static table of filesystems\n"
+#~ " -m, --mtab             search in table of mounted filesystems\n"
+#~ " -k, --kernel           search in kernel table of mounted \n"
+#~ "                        filesystems (default)\n"
+#~ "\n"
+#~ " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
+#~ " -w, --timeout <num>    upper limit in millisecods which --poll will "
+#~ "block\n"
+#~ "\n"
+#~ " -c, --canonicalize     canonicalize printed paths\n"
+#~ " -d, --direction <word> search direction - 'forward' or 'backward'\n"
+#~ " -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+#~ " -f, --first-only       print the first found filesystem only\n"
+#~ " -h, --help             print this help\n"
+#~ " -i, --invert           invert sense of matching\n"
+#~ " -l, --list             use list format output\n"
+#~ " -n, --noheadings       don't print headings\n"
+#~ " -u, --notruncate       don't truncate text in columns\n"
+#~ " -O, --options <list>   limit the set of filesystems by mount options\n"
+#~ " -o, --output <list>    output columns\n"
+#~ " -P, --pairs            use key=\"value\" output format\n"
+#~ " -r, --raw              use raw output format\n"
+#~ " -a, --ascii            use ascii chars for tree formatting\n"
+#~ " -t, --types <list>     limit the set of filesystem by FS types\n"
+#~ " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
+#~ " -R, --submounts        print all submount for the matching filesystems\n"
+#~ " -S, --source <string>  device, LABEL= or UUID=device\n"
+#~ " -T, --target <string>  mountpoint\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Tuỳ chọn:\n"
+#~ " -s, --fstab            tìm kiếm trong bảng tĩnh của hệ thống tập tin\n"
+#~ " -m, --mtab          tìm kiếm trong bảng của hệ thống tập tin đã lắp\n"
+#~ " -k, --kernel     tìm kiếm trong bảng hạt nhân của hệ thống tập tin đã "
+#~ "lắp (mặc định)\n"
+#~ "\n"
+#~ " -c, --canonicalize     làm cho hợp nguyên tắc các đường dẫn được in ra\n"
+#~ " -d, --direction <từ>    hướng tìm kiếm: « forward » (tiếp) hay « "
+#~ "backward » (lùi)\n"
+#~ " -e, --evaluate         in ra mọi THẺ (NHÃN/UUID) được tính\n"
+#~ " -f, --first-only       chỉ in ra hệ thống tập tin được tìm đầu tiên\n"
+#~ " -h, --help             in ra trợ giúp này\n"
+#~ " -i, --invert           đảo ngược cách khớp\n"
+#~ " -l, --list                xuất theo định dạng danh sách\n"
+#~ " -n, --noheadings       đừng in ra phần đầu\n"
+#~ " -u, --notruncate         đừng cắt ngắn chuỗi trong cột\n"
+#~ " -O, --options <danh_sách>   hạn chế tập hợp các hệ thống tập tin theo "
+#~ "tuỳ chọn lắp\n"
+#~ " -o, --output <danh_sách>    xuất cột\n"
+#~ " -r, --raw              xuất theo định dạng thô\n"
+#~ " -a, --ascii            định dạng cây bằng ký tự ASCII\n"
+#~ " -t, --types <danh_sách>     hạn chế tập hợp các hệ thống tập tin theo "
+#~ "kiểu HTTT\n"
+#~ " -S, --source <chuỗi>  thiết bị, LABEL= (nhãn là) hay UUID=thiết_bị\n"
+#~ " -T, --target <chuỗi>    điểm lắp\n"
+#~ "\n"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd byte ["
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sử dụng:\n"
+#~ " %1$s -a [-e] [-v] [-f]         bật tất cả các vùng trao đổi từ /etc/"
+#~ "fstab\n"
+#~ " %1$s [-p ưu_tiên] [-v] [-f] <đặc_biệt>  bật vùng trao đổi đưa ra\n"
+#~ " %1$s -s                            hiển thị lược sử về cách sử dụng vùng "
+#~ "trao đổi\n"
+#~ " %1$s -h                            hiển thị trợ giúp\n"
+#~ " %1$s -V                            hiển thị phiên bản\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sử dụng:\n"
+#~ " %1$s -a [-v]             \t\ttắt mọi trao đổi\n"
+#~ " %1$s [-v] <đặc_biệt>       \ttắt trao đổi đã cho\n"
+#~ " %1$s -h                           \thiển thị trợ giúp\n"
+#~ " %1$s -V                           \thiển thị phiên bản\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Sử dụng: %s [tùy_chọn ...] <tên_tập_tin>\n"
+#~ "\n"
+#~ "Tuỳ chọn:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Sử dụng: %s [các_tùy_chọn]\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "Sử dụng: %s [tùy_chọn ...] <thiết_bị>\n"
+#~ "\n"
+#~ "Tuỳ chọn:\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "Sử dụng: %s [tùy chọn] thiết bị...\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14216,29 +14459,11 @@ msgstr "Dòng nhập vào quá dài.\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [hay --help]:      in trợ giúp này"
 
-#~ msgid "dangerous options:"
-#~ msgstr "tùy chọn nguy hiểm:"
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr ""
 #~ "    -g [hay --show-geometry]: in ra cấu trúc đĩa theo quan niệm của nhân"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr ""
-#~ "    -G [hay --show-pt-geometry]: in ra cấu trúc dự đoán từ bảng phân vùng"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [hay --show-extended]: đồng thời liệt kê các phân vùng mở rộng\n"
-#~ "                             trong đầu ra hay các mô tả mong đợi cho "
-#~ "chúng\n"
-#~ "                             trong đầu vào"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr ""
@@ -14297,52 +14522,9 @@ msgstr "Dòng nhập vào quá dài.\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [tùychọn] [--] chuỗi_tùy_chọn tham_số\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr ""
-#~ "       getopt [tùychọn] -o|--options chuỗi_tùy_chọn [tùy_chọn] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              tham số\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr ""
-#~ "  -a, --alternative            Cho phép tùy chọn dài bắt đầu với một - "
-#~ "đơn\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   Hướng dẫn sử dụng nhỏ này\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=tùychọndài   Tùy chọn dài cần nhận ra\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr "  -n, --name=tên_chương_trình          Báo cáo lỗi dưới tên này\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=chuỗi_tùy_chọn      Các tùy chọn ngắn cần nhận ra\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr "  -q, --quiet                  Tắt bỏ báo cáo lỗi bằng getopt(3)\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           Không có kết quả ra thông thường\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr ""
-#~ "  -s, --shell=trình_bao            Đặt quy ước trích dẫn trình bao\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   Thử phiên bản getopt(1)\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 Không trích dẫn kết quả ra\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                In ra thông tin phiên bản\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (đã nâng cao) 1.1.4\n"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5de4ba028..df3734551 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng-2.14.1-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2008-08-23 23:20+0800\n"
 "Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
@@ -110,29 +110,29 @@ msgstr "重新读取分区表"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "获得512字节的段大小"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr ""
@@ -210,7 +210,7 @@ msgid "Verifying ... "
 msgstr "正在验证 ... "
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "%s: 不能打开 %s\n"
@@ -250,15 +250,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -271,7 +271,7 @@ msgstr ""
 msgid "cannot stat file %s"
 msgstr "%s 失败.\n"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -320,8 +320,8 @@ msgid "stat failed: %s"
 msgstr "%s 失败.\n"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, fuzzy, c-format
 msgid "open failed: %s"
 msgstr "查找失败"
@@ -547,55 +547,55 @@ msgstr ""
 msgid "compiled without -x support"
 msgstr ""
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "用法: %s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s 已经挂载.\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "你确认要继续"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "检查失败.\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "删除块"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "读取错误: 不能在文件 '%s' 中查找到该块\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "读取错误: 文件 '%s' 中有坏块\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -604,308 +604,308 @@ msgstr ""
 "内部错误: 试图写坏块\n"
 "写请求忽略\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "写入错误: 文件 '%s' 中有坏块\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "在 write_super_block 中查找失败"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "不能写超级块"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 #, fuzzy
 msgid "Unable to write inode map"
 msgstr "不能写 inode map"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "不能写 zone map"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "不能写 inodes"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "查找失败"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 #, fuzzy
 msgid "unable to alloc buffer for superblock"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "不能读超级块"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "只支持 1k 块/区"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "不正确的 s_imap_blocks 域在超级块中"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "不正确的 s_zmap_blocks 域在超级块中"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "不能为 inode map 分配缓冲区"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "不能为 zone map 分配缓冲区"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "不能为 inode count 分配缓冲区"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "不能为 zone count 分配缓冲区"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "不能读 inode map"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "不能读 zone map"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "不能读 inodes"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "警告: Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld 块\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "Firstdatazone=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "Zonesize=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "Maxsize=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "Filesystem state=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "namelen=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d 标记为未使用, 但用于文件 '%s'\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "标记为已使用"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "文件 `%s' 的模式 %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "警告: inode 计数太大.\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "根 inode 不是一个目录"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "块已经被使用, 现在在文件 `%s' 中."
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "清除"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "文件中块 %d `%s' 标记为没有使用."
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "正确"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "目录 '%s' 包含了一个不正确的 inode number 文件 '%.*s'. "
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " 删除"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s: 不正确的目录: '.' 不是第一个\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, fuzzy, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s: 不正确的目录: '.' 不是第一个\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "内部错误"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s: 不正确的目录: 大小 < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
 #, c-format
-msgid "Inode %d mode not cleared."
+msgid "Inode %lu mode not cleared."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
 #, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
 #, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
 #, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
 #, c-format
-msgid "Zone %d: marked in use, no file uses it."
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
 #, c-format
-msgid "Zone %d: in use, counted=%d\n"
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
 #, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
 "%6ld inodes used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -919,7 +919,7 @@ msgid ""
 "%6d files\n"
 msgstr ""
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1038,7 +1038,7 @@ msgstr ""
 msgid "not enough space, need at least %llu blocks"
 msgstr ""
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr ""
@@ -1187,9 +1187,9 @@ msgid "%6.2f%% (%+ld bytes)\t%s\n"
 msgstr ""
 
 #: disk-utils/mkfs.cramfs.c:668
-#, c-format
-msgid "closing file %s"
-msgstr ""
+#, fuzzy, c-format
+msgid "cannot close file %s"
+msgstr "%s: 不能打开 %s\n"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1291,185 +1291,195 @@ msgid ""
 "that some device files will be wrong."
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "不能读超级块"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "不能写超级块"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "不能写 inode map"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "不能写 zone map"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "不能写 inodes"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "%s:不是一个块设备\n"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, c-format
 msgid "%s: not enough good blocks"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "不能为 zone map 分配缓冲区"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodes\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld 块\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
 "\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "%s: 不能打开 %s\n"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "%s: 不能打开 %s\n"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "%s: 不正确的目录: 大小 < 32"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, fuzzy, c-format
 msgid "%s: stat failed"
 msgstr "%s 失败.\n"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, fuzzy, c-format
 msgid "%s: open failed"
 msgstr "%s 失败.\n"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, c-format
 msgid "%s: device is misaligned"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr ""
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, c-format
 msgid "%s: number of blocks too small"
 msgstr ""
@@ -1798,7 +1808,7 @@ msgstr ""
 msgid "%s: failed to write label"
 msgstr "在 write_block 中查找失败"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2122,7 +2132,7 @@ msgid "   Logical"
 msgstr ""
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr ""
 
@@ -2745,12 +2755,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr ""
@@ -2894,7 +2904,7 @@ msgid "tracks/cylinder"
 msgstr ""
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr ""
 
@@ -2961,12 +2971,12 @@ msgstr ""
 msgid "This partition already exists.\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr ""
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3167,7 +3177,7 @@ msgstr ""
 msgid "heads"
 msgstr ""
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr ""
 
@@ -3559,7 +3569,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr ""
 
@@ -3638,7 +3648,7 @@ msgstr ""
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr ""
@@ -3772,37 +3782,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr ""
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr ""
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr ""
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr ""
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3811,64 +3821,64 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr ""
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
 "The current boot file is: %s\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr ""
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr ""
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4135,7 +4145,7 @@ msgstr ""
 
 #: fdisk/fdisksgilabel.c:536
 #, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
 msgstr ""
 
 #: fdisk/fdisksgilabel.c:542
@@ -4147,7 +4157,7 @@ msgid ""
 "Type YES if you are sure about tagging this partition differently.\n"
 msgstr ""
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr ""
 
@@ -4326,26 +4336,26 @@ msgstr ""
 msgid "Unused gap - sectors %d-%d\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
 "Delete some/shrink them before retry.\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
 "and is of type `Whole disk'\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4353,14 +4363,14 @@ msgid ""
 "to %d %s\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
 "partition as Whole disk (5), starting at 0, with %u sectors\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4369,7 +4379,7 @@ msgid ""
 "tagged with 82 (Linux swap): "
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4382,7 +4392,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4391,28 +4401,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr ""
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr ""
 
@@ -4867,7 +4877,7 @@ msgstr ""
 msgid "Disk %s: cannot get size\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -4875,161 +4885,161 @@ msgid ""
 "[Use the --force option if you really want this]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
 "This will give problems with all software that uses C/H/S addressing.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
 "Disk %s: %lu cylinders, %lu heads, %lu sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
 "%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
 "before using mkfs\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5037,362 +5047,425 @@ msgid ""
 "For this listing I'll assume that geometry.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr ""
-
-#: fdisk/sfdisk.c:1247
+#: fdisk/sfdisk.c:1236
 #, c-format
-msgid "is not contained in partition %s\n"
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1258
+#: fdisk/sfdisk.c:1248
 #, c-format
-msgid "Warning: partitions %s "
+msgid "Warning: partitions %s and %s overlap\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
 "and will destroy it when filled\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 msgid ""
 "Warning: more than one primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 msgid ""
 "Warning: no primary partition is marked bootable (active)\n"
 "This does not matter for LILO, but the DOS MBR will not boot this disk.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr ""
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr ""
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
 "(For listing purposes only. Do not change its contents.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
 "Usually you only need to specify <start> and <size> (and perhaps <type>).\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "用法: %s [ -n ] device\n"
+msgstr "用法:\n"
 
-#: fdisk/sfdisk.c:2355
-#, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr ""
+#: fdisk/sfdisk.c:2332
+#, fuzzy, c-format
+msgid " %s [options] <device> [...]\n"
+msgstr "用法: %s [ -n ] device\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "用法: %s [ -n ] device\n"
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2364
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr ""
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5401,103 +5474,103 @@ msgid ""
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
 "but the DOS MBR will only boot a disk with 1 active partition.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5505,73 +5578,73 @@ msgid ""
 "Use the --no-reread flag to suppress this check.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr ""
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
 "sfdisk: premature end of input\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5599,100 +5672,102 @@ msgstr ""
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s 成功.\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s 失败.\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, c-format
 msgid "WARNING: couldn't open %s"
 msgstr ""
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr ""
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
 "\tshould fix your /etc/fstab file as soon as you can.\n"
 msgstr ""
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "%s: 不能打开 %s\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 msgid "wait: no more child process?!?"
 msgstr ""
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr ""
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr ""
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr ""
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'."
 msgstr ""
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr ""
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr ""
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr ""
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5700,58 +5775,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s:不是一个块设备\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "%s: 不能打开 %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "%s 已经挂载.\t"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr ""
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr ""
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s 需要一个参数\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -5768,33 +5843,65 @@ msgstr ""
 msgid "unknown shell after -s or --shell argument"
 msgstr ""
 
-#: getopt/getopt.c:314
+#: getopt/getopt.c:317
 #, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr ""
+
+#: getopt/getopt.c:323
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr ""
+
+#: getopt/getopt.c:324
+msgid " -h, --help                   This small usage guide\n"
 msgstr ""
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:325
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:326
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr ""
+
+#: getopt/getopt.c:327
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr ""
+
+#: getopt/getopt.c:328
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr ""
+
+#: getopt/getopt.c:329
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr ""
+
+#: getopt/getopt.c:330
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr ""
+
+#: getopt/getopt.c:331
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr ""
+
+#: getopt/getopt.c:332
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr ""
+
+#: getopt/getopt.c:333
+msgid " -V, --version                Output version information\n"
+msgstr ""
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr ""
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr ""
 
@@ -6197,137 +6304,151 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 msgid "Unable to connect to audit system"
 msgstr ""
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "不能读 inodes"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 msgid ""
 "You have specified multiple functions.\n"
 "You can only perform one function at a time."
 msgstr ""
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr ""
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr ""
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 msgid "No usable set-to time.  Cannot set clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr ""
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr ""
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr ""
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
 msgstr ""
@@ -6499,7 +6620,7 @@ msgid "failed to read mtab"
 msgstr "不能读 inodes"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr ""
 
@@ -6540,71 +6661,111 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, c-format
 msgid ""
 "\n"
 "For more information see mount(8).\n"
 msgstr ""
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 msgid "libmount context allocation failed"
 msgstr ""
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "不能读 inodes"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "不能读 inodes"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "不能为 inodes 分配缓冲区"
@@ -6687,7 +6848,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr ""
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr ""
 
@@ -7106,47 +7267,48 @@ msgstr ""
 msgid "too many bare linefeeds."
 msgstr ""
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, c-format
 msgid "timed out after %d seconds"
 msgstr ""
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr ""
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr ""
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "查找失败"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr ""
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr ""
@@ -7173,7 +7335,7 @@ msgstr ""
 msgid "setuid failed"
 msgstr "查找失败"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, fuzzy, c-format
 msgid "exec %s failed"
 msgstr "%s 失败.\n"
@@ -7218,8 +7380,8 @@ msgstr ""
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr ""
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 #, fuzzy
 msgid "fork failed"
 msgstr "查找失败"
@@ -7271,24 +7433,21 @@ msgstr ""
 msgid "%s %d"
 msgstr ""
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7396,32 +7555,32 @@ msgstr " 删除"
 msgid "failed to add line to output"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "%s: %s ioctl 错误\n"
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "%s 失败.\n"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "查找失败"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7432,90 +7591,115 @@ msgid ""
 " %1$s [options] [--source <device>] [--target <mountpoint>]\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:770
+#: misc-utils/findmnt.c:772
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "可用的命令:\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
 "For more information see findmnt(1).\n"
 msgstr ""
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr ""
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, fuzzy, c-format
 msgid "unknown direction '%s'"
 msgstr "%s: 未知命令: %s\n"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "不能读 inodes"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr ""
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr ""
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 #, fuzzy
 msgid "failed to initialize output table"
 msgstr "不能为 inodes 分配缓冲区"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr ""
 
@@ -7539,12 +7723,12 @@ msgstr ""
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr ""
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr ""
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr ""
@@ -7564,82 +7748,81 @@ msgstr ""
 msgid "connect %s"
 msgstr ""
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr ""
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr ""
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, c-format
 msgid "file %s"
 msgstr ""
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "不能读 inodes"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, c-format
 msgid "port `%ld' out of range"
 msgstr ""
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "%s: 未知命令: %s\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "%s: 未知命令: %s\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -7774,7 +7957,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "不能读 inodes"
 
 #: misc-utils/lsblk.c:809
@@ -7792,12 +7975,13 @@ msgstr "不能读 inodes"
 msgid "failed to parse list '%s'"
 msgstr "不能读 inodes"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7805,7 +7989,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -7828,40 +8012,40 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, c-format
 msgid ""
 "\n"
 "For more information see lsblk(8).\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "%s: 不能打开 %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "%s 失败.\n"
@@ -7881,22 +8065,12 @@ msgstr ""
 msgid "%s - No such file or directory\n"
 msgstr "根 inode 不是一个目录"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
-msgstr ""
-
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
+msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/namei.c:415
-#, c-format
+#: misc-utils/namei.c:416
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -7908,18 +8082,17 @@ msgid ""
 " -v, --vertical      vertical align of modes and owners\n"
 msgstr ""
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
 msgstr ""
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 msgid "pathname argument is missing"
 msgstr ""
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr ""
@@ -7929,166 +8102,164 @@ msgstr ""
 msgid "renaming %s to %s failed"
 msgstr "%s 失败.\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr ""
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr ""
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr ""
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr ""
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, fuzzy, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "不能读 inodes"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, fuzzy, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "不能读 inodes"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr ""
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:379
+#: misc-utils/uuidd.c:380
 #, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr ""
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:397
+#: misc-utils/uuidd.c:401
 #, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr ""
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, c-format
 msgid "Unexpected reply length from server %d"
 msgstr ""
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:546
+#: misc-utils/uuidd.c:551
 #, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr ""
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] ""
+msgstr[1] ""
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr ""
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8096,29 +8267,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8152,42 +8322,43 @@ msgstr "%s 失败.\n"
 
 #: misc-utils/wipefs.c:240
 #, c-format
-msgid "%zd bytes ["
-msgstr ""
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr ""
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr ""
 
-#: misc-utils/wipefs.c:306
-#, c-format
+#: misc-utils/wipefs.c:305
+#, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "用法: %s [ -n ] device\n"
+
+#: misc-utils/wipefs.c:308
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
 "For more information see wipefs(8).\n"
 msgstr ""
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr ""
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8277,118 +8448,116 @@ msgstr ""
 msgid "can't rename %s to %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr ""
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr ""
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr ""
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr ""
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr ""
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr ""
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr ""
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%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/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr ""
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr ""
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr ""
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr ""
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr ""
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr ""
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr ""
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr ""
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr ""
 
-#: mount/lomount.c:1013
+#: mount/lomount.c:1017
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8396,51 +8565,48 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr ""
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr ""
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr ""
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr ""
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr ""
@@ -8953,160 +9119,163 @@ msgstr ""
 msgid "not enough memory"
 msgstr ""
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 
-#: mount/swapon.c:102
-#, c-format
+#: mount/swapon.c:104 mount/swapon.c:125
+#, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "用法: %s [ -n ] device\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr ""
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr ""
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 #, fuzzy
 msgid "execv failed"
 msgstr "查找失败"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr ""
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, fuzzy, c-format
 msgid "%s: lseek failed"
 msgstr "查找失败"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr ""
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr ""
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr ""
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr ""
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr ""
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr ""
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, fuzzy, c-format
 msgid "%s: get size failed"
 msgstr "查找失败"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr ""
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr ""
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr ""
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr ""
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr ""
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr ""
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr ""
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, fuzzy, c-format
 msgid "%s: swapon failed"
 msgstr "%s 失败.\n"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr ""
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr ""
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, fuzzy, c-format
 msgid "%s: swapoff failed"
 msgstr "%s 失败.\n"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr ""
@@ -9365,7 +9534,7 @@ msgstr ""
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -9425,19 +9594,13 @@ msgstr ""
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr ""
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -9448,47 +9611,46 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "可用的命令:\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, c-format
 msgid ""
 "\n"
 "For more information see partx(8).\n"
 msgstr ""
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, c-format
 msgid "the options %s are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "不能读 inodes"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 msgid "--nr and <partition> are mutually exclusive"
 msgstr ""
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "不能为 inodes 分配缓冲区"
@@ -9614,7 +9776,7 @@ msgstr "不能读 inodes"
 msgid "failed to set pid %d's policy"
 msgstr ""
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr ""
@@ -9874,7 +10036,7 @@ msgstr ""
 msgid "Can't set signal handler"
 msgstr ""
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr ""
 
@@ -9883,24 +10045,24 @@ msgstr ""
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr ""
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr ""
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
 msgstr ""
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr ""
@@ -9987,123 +10149,106 @@ msgstr ""
 msgid "ftp daemon"
 msgstr ""
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
-msgstr "用法: %s [ -n ] device\n"
-
 #: sys-utils/dmesg.c:137
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+#: sys-utils/dmesg.c:156
+msgid ""
+"\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "不能读 inodes"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "%s: 未知命令: %s\n"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "不能读 inodes"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "%s: 未知命令: %s\n"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "查找失败"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "不能读 inodes"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 msgid "unsupported command"
 msgstr ""
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "用法: %s [ -n ] device\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10111,38 +10256,38 @@ msgid ""
 " -l, --length <num>  length of the allocation, in bytes\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
 "For more information see fallocate(1).\n"
 msgstr ""
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr ""
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr ""
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr ""
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr ""
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr ""
@@ -10150,98 +10295,97 @@ msgstr ""
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
 msgstr ""
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:72
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
+msgstr ""
+
+#: sys-utils/flock.c:195
 #, fuzzy, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s 需要一个参数\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, fuzzy, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s: 不能打开 %s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr ""
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr ""
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, fuzzy, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s 失败.\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
 #, fuzzy, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+msgid " %s [options] <mount point>\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr ""
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, fuzzy, c-format
 msgid "%s: fstat failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, fuzzy, c-format
 msgid "%s: is not a directory"
 msgstr "根 inode 不是一个目录"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, fuzzy, c-format
 msgid "%s: freeze failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, fuzzy, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10250,95 +10394,84 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, c-format
+#: sys-utils/fstrim.c:66
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "不能读 inodes"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "不能读 inodes"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "不能读 inodes"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 msgid "no mountpoint specified."
 msgstr ""
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "根 inode 不是一个目录"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s 失败.\n"
 
-#: sys-utils/fstrim.c:146
-#, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:84
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr ""
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr ""
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr ""
@@ -10827,7 +10960,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:621
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:623
@@ -10837,7 +10970,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:625
 #, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:628
@@ -10869,7 +11002,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:647
 #, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:649
@@ -10901,7 +11034,7 @@ msgstr ""
 
 #: sys-utils/ipcs.c:680
 #, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr ""
 
 #: sys-utils/ipcs.c:682
@@ -10949,69 +11082,67 @@ msgstr ""
 msgid "invalid iflag: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:150
+#: sys-utils/ldattach.c:151
 #, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr ""
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr ""
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr ""
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr ""
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr ""
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr ""
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr ""
 
@@ -11163,48 +11294,43 @@ msgstr ""
 msgid "NUMA node%d CPU(s):"
 msgstr ""
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, c-format
 msgid ""
 "\n"
 "For more information see mountpoint(1).\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "根 inode 不是一个目录"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s 已经挂载.\t"
@@ -11227,55 +11353,50 @@ msgid ""
 "\t -V            print version and exit\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr ""
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr ""
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
 msgstr ""
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -11284,237 +11405,226 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, c-format
+#: sys-utils/renice.c:69
 msgid ""
 "\n"
 "For more information see renice(1).\n"
 msgstr ""
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr ""
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "%s: 未知命令: %s\n"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, c-format
 msgid "bad value %s"
 msgstr ""
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 msgid "user ID"
 msgstr ""
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "不能读 inodes"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "不能读 inodes"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr "用法: %s [ -n ] device\n"
-
-#: sys-utils/rtcwake.c:90
-#, c-format
+#: sys-utils/rtcwake.c:91
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:100
-#, c-format
+#: sys-utils/rtcwake.c:101
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "查找失败"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "查找失败"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "查找失败"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "查找失败"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 msgid "enable rtc alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 msgid "set rtc wake alarm failed"
 msgstr ""
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "查找失败"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "查找失败"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr ""
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "不能读 inodes"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "不能读 inodes"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 msgid "must provide wake time (see -t and -s options)"
 msgstr ""
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: 不能打开 %s\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, c-format
 msgid "time doesn't go backward to %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "不能读 inodes"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "查找失败"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 msgid "disable rtc alarm interrupt failed"
 msgstr ""
 
@@ -11565,16 +11675,16 @@ msgid ""
 "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr ""
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr ""
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr ""
@@ -11655,172 +11765,169 @@ msgstr ""
 msgid "%s using polling\n"
 msgstr ""
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
-msgstr ""
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
+msgstr "用法: %s [ -n ] device\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
 msgstr ""
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 #, fuzzy
 msgid "unshare failed"
 msgstr "查找失败"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr ""
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 #, fuzzy
 msgid "cannot set user id"
 msgstr "%s: 不能打开 %s\n"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "查找失败"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "查找失败"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, c-format
 msgid "%s: can't change process priority: %m"
 msgstr ""
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr ""
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "不能为 inodes 分配缓冲区"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr ""
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "%s 需要一个参数\n"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "不能为 inodes 分配缓冲区"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr ""
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr ""
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr ""
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr ""
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr ""
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr ""
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr ""
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr ""
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -11832,67 +11939,61 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr ""
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "查找失败"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "%s 失败.\n"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 msgid "is y"
 msgstr ""
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 msgid "is n"
 msgstr ""
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "%s 失败.\n"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, c-format
 msgid "invalid argument: %c"
 msgstr ""
@@ -11905,129 +12006,120 @@ msgid ""
 "Program not started."
 msgstr ""
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "用法: %s [ -n ] device\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr ""
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr ""
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s: 不能打开 %s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
 "Script done on %s"
 msgstr ""
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr ""
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "查找失败"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 msgid "out of pty's"
 msgstr ""
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr ""
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr ""
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 msgid "wrong number of arguments"
 msgstr ""
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr ""
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr ""
@@ -12038,106 +12130,103 @@ msgid "Argument error."
 msgstr "内部错误"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, c-format
 msgid ""
 "\n"
 "For more information see lsblk(1).\n"
 msgstr ""
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 msgid "cannot force blank"
 msgstr ""
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 msgid "cannot force unblank"
 msgstr ""
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 msgid "cannot get blank status"
 msgstr ""
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "%s: 不能打开 %s\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "%s: 不能打开 %s\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "内部错误"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 msgid "Error writing screendump"
 msgstr ""
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "%s 失败.\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 msgid "$TERM is not defined."
 msgstr ""
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, c-format
 msgid "%s: unknown terminal type"
 msgstr ""
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -12165,138 +12254,140 @@ msgstr ""
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 msgid "invalid timeout argument"
 msgstr ""
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, c-format
 msgid "invalid timeout argument: %s"
 msgstr ""
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s: 不能打开 %s\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "%s: 不能打开 %s\n"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 msgid "cannot get tty name"
 msgstr ""
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr ""
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, c-format
 msgid "will not read %s - use stdin."
 msgstr ""
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s 失败.\n"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "查找失败"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr "用法: %s [ -n ] device\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 msgid "can't find your tty's name"
 msgstr ""
 
-#: term-utils/write.c:146
-msgid "you have write permission turned off."
+#: term-utils/write.c:148
+msgid "you have write permission turned off"
 msgstr ""
 
-#: term-utils/write.c:164
-#, c-format
-msgid "%s is not logged in on %s."
-msgstr ""
+#: term-utils/write.c:166
+#, fuzzy, c-format
+msgid "%s is not logged in on %s"
+msgstr "%s 已经挂载.\t"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, c-format
 msgid "%s has messages disabled on %s"
 msgstr ""
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "%s 已经挂载.\t"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, c-format
 msgid "%s has messages disabled"
 msgstr ""
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr ""
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, c-format
 msgid "tty path %s too long"
 msgstr ""
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr ""
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "查找失败"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr "用法: %s [ -n ] device\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -12471,7 +12562,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -12636,7 +12727,7 @@ msgid ""
 "Pattern not found\n"
 msgstr ""
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr ""
 
@@ -12698,7 +12789,7 @@ msgstr ""
 msgid "bad conversion character %%%s"
 msgstr ""
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -12726,87 +12817,87 @@ msgid ""
 "-------------------------------------------------------\n"
 msgstr ""
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr ""
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr ""
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr ""
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr ""
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr ""
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr ""
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr ""
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr ""
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr ""
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr ""
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr ""
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr ""
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr ""
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr ""
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr ""
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr ""
 
@@ -12874,8 +12965,8 @@ msgstr "用法: %s [ -n ] device\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -12890,38 +12981,64 @@ msgstr "不能读 inodes"
 msgid "no input file specified"
 msgstr ""
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "用法: %s [ -n ] device\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr ""
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr ""
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 msgid "Input line too long."
 msgstr ""
 
-#~ msgid "Usage:\n"
-#~ msgstr "用法:\n"
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "用法: %s [ -n ] device\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr "用法: %s [ -n ] device\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "用法: %s [ -n ] device\n"
 
 #~ msgid "  %s --report [devices]\n"
 #~ msgstr "  %s --report [devices]\n"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 78e9d3db4..22d06418c 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: util-linux-ng 2.18-rc2\n"
-"Report-Msgid-Bugs-To: Karel Zak <kzak@redhat.com>\n"
-"POT-Creation-Date: 2011-07-28 13:51+0200\n"
+"Report-Msgid-Bugs-To: util-linux@vger.kernel.org\n"
+"POT-Creation-Date: 2011-08-17 00:37+0200\n"
 "PO-Revision-Date: 2010-08-22 00:14+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@gmail.com>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -104,29 +104,29 @@ msgstr "重新讀取分割表"
 msgid ""
 "\n"
 "Usage:\n"
-"  %1$s -V\n"
-"  %1$s --report [devices]\n"
-"  %1$s [-v|-q] commands devices\n"
+" %1$s -V\n"
+" %1$s --report [devices]\n"
+" %1$s [-v|-q] commands devices\n"
 "\n"
 "Available commands:\n"
 msgstr ""
 
 #: disk-utils/blockdev.c:188
 #, fuzzy, c-format
-msgid "  %-25s get size in 512-byte sectors\n"
+msgid " %-25s get size in 512-byte sectors\n"
 msgstr "以 512 位元組為單位取得大小"
 
-#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1260
-#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:657
-#: misc-utils/ddate.c:181 mount/swapon.c:708 mount/swapon.c:760
-#: sys-utils/readprofile.c:183 sys-utils/tunelp.c:86
+#: disk-utils/blockdev.c:230 disk-utils/fsck.minix.c:1272
+#: disk-utils/isosize.c:196 disk-utils/mkfs.c:59 disk-utils/mkfs.minix.c:662
+#: misc-utils/ddate.c:181 mount/swapon.c:721 mount/swapon.c:773
+#: sys-utils/readprofile.c:184 sys-utils/tunelp.c:86
 #, c-format
 msgid "%s (%s)\n"
 msgstr "%s (%s)\n"
 
 #: disk-utils/blockdev.c:274 disk-utils/blockdev.c:418
 #: disk-utils/blockdev.c:443 disk-utils/mkfs.bfs.c:178
-#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:269
+#: disk-utils/mkfs.cramfs.c:788 sys-utils/ldattach.c:273
 #, c-format
 msgid "cannot open %s"
 msgstr "無法開啟 %s"
@@ -208,7 +208,7 @@ msgid "Verifying ... "
 msgstr "驗證中…"
 
 #: disk-utils/fdformat.c:61 disk-utils/fdformat.c:153
-#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:261
+#: disk-utils/mkfs.cramfs.c:663 term-utils/wall.c:262
 #, fuzzy, c-format
 msgid "cannot open file %s"
 msgstr "無法開啟檔案 '%s'"
@@ -248,15 +248,15 @@ msgid ""
 msgstr ""
 
 #: disk-utils/fdformat.c:129 disk-utils/mkfs.bfs.c:88
-#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2639
-#: fsck/fsck.c:1413 getopt/getopt.c:425 hwclock/hwclock.c:1354
-#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:236
-#: misc-utils/look.c:124 misc-utils/mcookie.c:115 misc-utils/namei.c:457
-#: misc-utils/rename.c:98 misc-utils/uuidd.c:503 misc-utils/uuidgen.c:74
-#: misc-utils/whereis.c:401 misc-utils/wipefs.c:359 schedutils/ionice.c:169
-#: sys-utils/dmesg.c:682 term-utils/agetty.c:574 term-utils/mesg.c:102
-#: term-utils/script.c:213 term-utils/scriptreplay.c:168
-#: term-utils/setterm.c:812 term-utils/wall.c:138 term-utils/write.c:108
+#: disk-utils/mkfs.cramfs.c:767 disk-utils/mkswap.c:498 fdisk/sfdisk.c:2616
+#: fsck/fsck.c:1414 getopt/getopt.c:430 hwclock/hwclock.c:1354
+#: misc-utils/cal.c:351 misc-utils/kill.c:195 misc-utils/logger.c:234
+#: misc-utils/look.c:124 misc-utils/mcookie.c:116 misc-utils/namei.c:458
+#: misc-utils/rename.c:99 misc-utils/uuidd.c:508 misc-utils/uuidgen.c:75
+#: misc-utils/whereis.c:403 misc-utils/wipefs.c:361 schedutils/ionice.c:169
+#: sys-utils/dmesg.c:685 term-utils/agetty.c:664 term-utils/mesg.c:103
+#: term-utils/script.c:212 term-utils/scriptreplay.c:170
+#: term-utils/setterm.c:811 term-utils/wall.c:139 term-utils/write.c:110
 #: text-utils/col.c:210 text-utils/colcrt.c:116 text-utils/colrm.c:171
 #: text-utils/column.c:149 text-utils/hexsyntax.c:114 text-utils/rev.c:112
 #: text-utils/tailf.c:263 text-utils/ul.c:193
@@ -269,7 +269,7 @@ msgstr "%s 來自 %s\n"
 msgid "cannot stat file %s"
 msgstr "無法識別裝置狀態 %s"
 
-#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:800
+#: disk-utils/fdformat.c:147 misc-utils/lsblk.c:788 partx/partx.c:803
 #: sys-utils/mountpoint.c:70
 #, fuzzy, c-format
 msgid "%s: not a block device"
@@ -318,8 +318,8 @@ msgid "stat failed: %s"
 msgstr "狀態取得失敗：%s"
 
 #: disk-utils/fsck.cramfs.c:145 disk-utils/fsck.cramfs.c:497
-#: sys-utils/rtcwake.c:114 sys-utils/rtcwake.c:273 sys-utils/rtcwake.c:512
-#: term-utils/script.c:234 term-utils/script.c:555
+#: sys-utils/rtcwake.c:115 sys-utils/rtcwake.c:274 sys-utils/rtcwake.c:513
+#: term-utils/script.c:233 term-utils/script.c:554
 #, c-format
 msgid "open failed: %s"
 msgstr "開啟失敗：%s"
@@ -541,55 +541,55 @@ msgstr "無效的檔案資料偏移值"
 msgid "compiled without -x support"
 msgstr "編譯時不具 -x 支援"
 
-#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2865
+#: disk-utils/fsck.cramfs.c:676 fdisk/sfdisk.c:2842
 #, c-format
 msgid "%s: OK\n"
 msgstr "%s：確定\n"
 
-#: disk-utils/fsck.minix.c:195
+#: disk-utils/fsck.minix.c:196
 #, c-format
 msgid "Usage: %s [-larvsmf] /dev/name\n"
 msgstr "用法：%s [-larvsmf] /dev/name\n"
 
-#: disk-utils/fsck.minix.c:292
+#: disk-utils/fsck.minix.c:293
 #, c-format
 msgid "%s is mounted.\t "
 msgstr "%s 已掛載。\t"
 
-#: disk-utils/fsck.minix.c:294
+#: disk-utils/fsck.minix.c:295
 msgid "Do you really want to continue"
 msgstr "您真的要繼續嗎？"
 
-#: disk-utils/fsck.minix.c:298
+#: disk-utils/fsck.minix.c:299
 #, c-format
 msgid "check aborted.\n"
 msgstr "已放棄檢查。\n"
 
-#: disk-utils/fsck.minix.c:317 disk-utils/fsck.minix.c:340
+#: disk-utils/fsck.minix.c:318 disk-utils/fsck.minix.c:341
 #, c-format
 msgid "Zone nr < FIRSTZONE in file `%s'."
 msgstr "區域 nr < 檔案「%s」中的 FIRSTZONE。"
 
-#: disk-utils/fsck.minix.c:321 disk-utils/fsck.minix.c:344
+#: disk-utils/fsck.minix.c:322 disk-utils/fsck.minix.c:345
 #, c-format
 msgid "Zone nr >= ZONES in file `%s'."
 msgstr "區域 nr >= 檔案「%s」中的 ZONES。"
 
-#: disk-utils/fsck.minix.c:326 disk-utils/fsck.minix.c:349
+#: disk-utils/fsck.minix.c:327 disk-utils/fsck.minix.c:350
 msgid "Remove block"
 msgstr "移除區塊"
 
-#: disk-utils/fsck.minix.c:367
+#: disk-utils/fsck.minix.c:368
 #, c-format
 msgid "Read error: unable to seek to block in file '%s'\n"
 msgstr "讀取錯誤：無法在檔案「%s」中搜尋到區塊\n"
 
-#: disk-utils/fsck.minix.c:373
+#: disk-utils/fsck.minix.c:374
 #, c-format
 msgid "Read error: bad block in file '%s'\n"
 msgstr "讀取錯誤：在檔案「%s」中有不良區塊\n"
 
-#: disk-utils/fsck.minix.c:388
+#: disk-utils/fsck.minix.c:389
 #, c-format
 msgid ""
 "Internal error: trying to write bad block\n"
@@ -598,294 +598,294 @@ msgstr ""
 "內部錯誤：嘗試寫入不良區塊\n"
 "寫入要求已忽略\n"
 
-#: disk-utils/fsck.minix.c:394
+#: disk-utils/fsck.minix.c:395
 msgid "seek failed in write_block"
 msgstr "write_block 時搜尋失敗"
 
-#: disk-utils/fsck.minix.c:397
+#: disk-utils/fsck.minix.c:398
 #, c-format
 msgid "Write error: bad block in file '%s'\n"
 msgstr "寫入錯誤：在檔案「%s」中有不良區塊\n"
 
-#: disk-utils/fsck.minix.c:513
+#: disk-utils/fsck.minix.c:514
 msgid "seek failed in write_super_block"
 msgstr "write_super_block 時搜尋失敗"
 
-#: disk-utils/fsck.minix.c:515
+#: disk-utils/fsck.minix.c:516
 msgid "unable to write super-block"
 msgstr "無法寫入 super-block"
 
-#: disk-utils/fsck.minix.c:528
+#: disk-utils/fsck.minix.c:529
 msgid "Unable to write inode map"
 msgstr "無法寫入 inode 對映"
 
-#: disk-utils/fsck.minix.c:530
+#: disk-utils/fsck.minix.c:532
 msgid "Unable to write zone map"
 msgstr "無法寫入區域對映"
 
-#: disk-utils/fsck.minix.c:532
+#: disk-utils/fsck.minix.c:535
 msgid "Unable to write inodes"
 msgstr "無法寫入 inodes"
 
-#: disk-utils/fsck.minix.c:559
+#: disk-utils/fsck.minix.c:563
 msgid "seek failed"
 msgstr "搜尋失敗"
 
-#: disk-utils/fsck.minix.c:563
+#: disk-utils/fsck.minix.c:567
 msgid "unable to alloc buffer for superblock"
 msgstr "無法配置緩衝區給超區塊"
 
-#: disk-utils/fsck.minix.c:566
+#: disk-utils/fsck.minix.c:570
 msgid "unable to read super block"
 msgstr "無法讀取超區塊"
 
-#: disk-utils/fsck.minix.c:584
+#: disk-utils/fsck.minix.c:588
 msgid "bad magic number in super-block"
 msgstr "超區塊中有不當的魔術數字"
 
-#: disk-utils/fsck.minix.c:586
+#: disk-utils/fsck.minix.c:590
 msgid "Only 1k blocks/zones supported"
 msgstr "只有支援 1k 區塊/區域"
 
-#: disk-utils/fsck.minix.c:588
+#: disk-utils/fsck.minix.c:592
 msgid "bad s_imap_blocks field in super-block"
 msgstr "超區塊中有不當的 s_imap_blocks 欄位"
 
-#: disk-utils/fsck.minix.c:590
+#: disk-utils/fsck.minix.c:594
 msgid "bad s_zmap_blocks field in super-block"
 msgstr "超區塊中有不當的 s_zmap_blocks 欄位"
 
-#: disk-utils/fsck.minix.c:605
+#: disk-utils/fsck.minix.c:610
 msgid "Unable to allocate buffer for inode map"
 msgstr "無法配置 inode 對映緩衝區"
 
-#: disk-utils/fsck.minix.c:608
+#: disk-utils/fsck.minix.c:613
 msgid "Unable to allocate buffer for zone map"
 msgstr "無法配置區域對映緩衝區"
 
-#: disk-utils/fsck.minix.c:613
+#: disk-utils/fsck.minix.c:618
 msgid "Unable to allocate buffer for inodes"
 msgstr "無法配置 inodes 緩衝區"
 
-#: disk-utils/fsck.minix.c:616
+#: disk-utils/fsck.minix.c:621
 msgid "Unable to allocate buffer for inode count"
 msgstr "無法配置 inode 計數緩衝區"
 
-#: disk-utils/fsck.minix.c:619
+#: disk-utils/fsck.minix.c:624
 msgid "Unable to allocate buffer for zone count"
 msgstr "無法配置區域計數緩衝區"
 
-#: disk-utils/fsck.minix.c:621
+#: disk-utils/fsck.minix.c:628
 msgid "Unable to read inode map"
 msgstr "無法讀取 inode 對映"
 
-#: disk-utils/fsck.minix.c:623
+#: disk-utils/fsck.minix.c:632
 msgid "Unable to read zone map"
 msgstr "無法讀取區域對映"
 
-#: disk-utils/fsck.minix.c:625
+#: disk-utils/fsck.minix.c:636
 msgid "Unable to read inodes"
 msgstr "無法讀取 inodes"
 
-#: disk-utils/fsck.minix.c:627
+#: disk-utils/fsck.minix.c:638
 #, c-format
 msgid "Warning: Firstzone != Norm_firstzone\n"
 msgstr "警告：Firstzone != Norm_firstzone\n"
 
-#: disk-utils/fsck.minix.c:632 disk-utils/mkfs.minix.c:534
+#: disk-utils/fsck.minix.c:643
 #, c-format
 msgid "%ld inodes\n"
 msgstr "%ld inodes\n"
 
-#: disk-utils/fsck.minix.c:633 disk-utils/mkfs.minix.c:535
+#: disk-utils/fsck.minix.c:644
 #, c-format
 msgid "%ld blocks\n"
 msgstr "%ld 區塊\n"
 
-#: disk-utils/fsck.minix.c:634 disk-utils/mkfs.minix.c:536
+#: disk-utils/fsck.minix.c:645 disk-utils/mkfs.minix.c:541
 #, c-format
 msgid "Firstdatazone=%ld (%ld)\n"
 msgstr "第一資料區=%ld (%ld)\n"
 
-#: disk-utils/fsck.minix.c:635 disk-utils/mkfs.minix.c:537
+#: disk-utils/fsck.minix.c:646 disk-utils/mkfs.minix.c:542
 #, c-format
 msgid "Zonesize=%d\n"
 msgstr "區域大小=%d\n"
 
-#: disk-utils/fsck.minix.c:636
+#: disk-utils/fsck.minix.c:647
 #, c-format
 msgid "Maxsize=%ld\n"
 msgstr "最大大小=%ld\n"
 
-#: disk-utils/fsck.minix.c:637
+#: disk-utils/fsck.minix.c:648
 #, c-format
 msgid "Filesystem state=%d\n"
 msgstr "檔案系統狀態=%d\n"
 
-#: disk-utils/fsck.minix.c:638
-#, c-format
+#: disk-utils/fsck.minix.c:649
+#, fuzzy, c-format
 msgid ""
-"namelen=%d\n"
+"namelen=%zd\n"
 "\n"
 msgstr ""
 "名稱長度=%d\n"
 "\n"
 
-#: disk-utils/fsck.minix.c:653 disk-utils/fsck.minix.c:704
+#: disk-utils/fsck.minix.c:664 disk-utils/fsck.minix.c:715
 #, c-format
 msgid "Inode %d marked unused, but used for file '%s'\n"
 msgstr "Inode %d 標記為未使用，但是卻用於檔案「%s」\n"
 
-#: disk-utils/fsck.minix.c:657 disk-utils/fsck.minix.c:708
+#: disk-utils/fsck.minix.c:668 disk-utils/fsck.minix.c:719
 msgid "Mark in use"
 msgstr "標記為使用中"
 
-#: disk-utils/fsck.minix.c:679 disk-utils/fsck.minix.c:728
+#: disk-utils/fsck.minix.c:690 disk-utils/fsck.minix.c:739
 #, c-format
 msgid "The file `%s' has mode %05o\n"
 msgstr "檔案「%s」具有模式 %05o\n"
 
-#: disk-utils/fsck.minix.c:686 disk-utils/fsck.minix.c:734
+#: disk-utils/fsck.minix.c:697 disk-utils/fsck.minix.c:745
 #, c-format
 msgid "Warning: inode count too big.\n"
 msgstr "警告：inode 數量太大。\n"
 
-#: disk-utils/fsck.minix.c:746 disk-utils/fsck.minix.c:754
+#: disk-utils/fsck.minix.c:757 disk-utils/fsck.minix.c:765
 msgid "root inode isn't a directory"
 msgstr "根 inode 並非目錄"
 
-#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:797
+#: disk-utils/fsck.minix.c:777 disk-utils/fsck.minix.c:808
 #, c-format
 msgid "Block has been used before. Now in file `%s'."
 msgstr "區塊於之前已使用。現在屬於檔案「%s」。"
 
-#: disk-utils/fsck.minix.c:768 disk-utils/fsck.minix.c:799
-#: disk-utils/fsck.minix.c:1122 disk-utils/fsck.minix.c:1131
-#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1186
+#: disk-utils/fsck.minix.c:779 disk-utils/fsck.minix.c:810
+#: disk-utils/fsck.minix.c:1133 disk-utils/fsck.minix.c:1143
+#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1198
 msgid "Clear"
 msgstr "清除"
 
-#: disk-utils/fsck.minix.c:778 disk-utils/fsck.minix.c:809
+#: disk-utils/fsck.minix.c:789 disk-utils/fsck.minix.c:820
 #, c-format
 msgid "Block %d in file `%s' is marked not in use."
 msgstr "檔案「%2$s」中的 區塊 %1$d 已標記為未被使用。"
 
-#: disk-utils/fsck.minix.c:780 disk-utils/fsck.minix.c:811
+#: disk-utils/fsck.minix.c:791 disk-utils/fsck.minix.c:822
 msgid "Correct"
 msgstr "修正"
 
-#: disk-utils/fsck.minix.c:950 disk-utils/fsck.minix.c:1017
+#: disk-utils/fsck.minix.c:961 disk-utils/fsck.minix.c:1028
 #, c-format
 msgid "The directory '%s' contains a bad inode number for file '%.*s'."
 msgstr "目錄「%s」含有不當的 inode 編號於檔案「%.*s」。"
 
-#: disk-utils/fsck.minix.c:953 disk-utils/fsck.minix.c:1020
+#: disk-utils/fsck.minix.c:964 disk-utils/fsck.minix.c:1031
 msgid " Remove"
 msgstr " 移除"
 
-#: disk-utils/fsck.minix.c:967 disk-utils/fsck.minix.c:1034
+#: disk-utils/fsck.minix.c:978 disk-utils/fsck.minix.c:1045
 #, c-format
 msgid "%s: bad directory: '.' isn't first\n"
 msgstr "%s：不當的目錄：「.」不是第一個\n"
 
-#: disk-utils/fsck.minix.c:975 disk-utils/fsck.minix.c:1043
+#: disk-utils/fsck.minix.c:986 disk-utils/fsck.minix.c:1054
 #, c-format
 msgid "%s: bad directory: '..' isn't second\n"
 msgstr "%s：不當的目錄：「..」不是第二個\n"
 
-#: disk-utils/fsck.minix.c:1077 disk-utils/fsck.minix.c:1095
+#: disk-utils/fsck.minix.c:1088 disk-utils/fsck.minix.c:1106
 msgid "internal error"
 msgstr "內部錯誤"
 
-#: disk-utils/fsck.minix.c:1080 disk-utils/fsck.minix.c:1098
+#: disk-utils/fsck.minix.c:1091 disk-utils/fsck.minix.c:1109
 #, c-format
 msgid "%s: bad directory: size < 32"
 msgstr "%s：不當的目錄：大小 < 32"
 
-#: disk-utils/fsck.minix.c:1111
+#: disk-utils/fsck.minix.c:1122
 msgid "seek failed in bad_zone"
 msgstr "在損毀區域中搜尋失敗"
 
-#: disk-utils/fsck.minix.c:1121 disk-utils/fsck.minix.c:1176
-#, c-format
-msgid "Inode %d mode not cleared."
+#: disk-utils/fsck.minix.c:1132 disk-utils/fsck.minix.c:1188
+#, fuzzy, c-format
+msgid "Inode %lu mode not cleared."
 msgstr "Inode %d 模式無法清空。"
 
-#: disk-utils/fsck.minix.c:1130 disk-utils/fsck.minix.c:1185
-#, c-format
-msgid "Inode %d not used, marked used in the bitmap."
+#: disk-utils/fsck.minix.c:1141 disk-utils/fsck.minix.c:1197
+#, fuzzy, c-format
+msgid "Inode %lu not used, marked used in the bitmap."
 msgstr "Inode %d 未被使用，在點陣圖中標記為使用。"
 
-#: disk-utils/fsck.minix.c:1136 disk-utils/fsck.minix.c:1191
-#, c-format
-msgid "Inode %d used, marked unused in the bitmap."
+#: disk-utils/fsck.minix.c:1148 disk-utils/fsck.minix.c:1203
+#, fuzzy, c-format
+msgid "Inode %lu used, marked unused in the bitmap."
 msgstr "Inode %d 已使用，在點陣圖中標記為未使用。"
 
-#: disk-utils/fsck.minix.c:1138 disk-utils/fsck.minix.c:1192
+#: disk-utils/fsck.minix.c:1150 disk-utils/fsck.minix.c:1204
 msgid "Set"
 msgstr "設定"
 
-#: disk-utils/fsck.minix.c:1142 disk-utils/fsck.minix.c:1196
-#, c-format
-msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d."
+#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1208
+#, fuzzy, c-format
+msgid "Inode %lu (mode = %07o), i_nlinks=%d, counted=%d."
 msgstr "Inode %d (模式 = %07o)，i_nlinks=%d，數量=%d。"
 
-#: disk-utils/fsck.minix.c:1144 disk-utils/fsck.minix.c:1198
+#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
 msgid "Set i_nlinks to count"
 msgstr "設定 in_links 加入計數"
 
-#: disk-utils/fsck.minix.c:1156 disk-utils/fsck.minix.c:1210
-#, c-format
-msgid "Zone %d: marked in use, no file uses it."
+#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222
+#, fuzzy, c-format
+msgid "Zone %lu: marked in use, no file uses it."
 msgstr "區域 %d: 標記為使用中，但無檔案使用它。"
 
-#: disk-utils/fsck.minix.c:1157 disk-utils/fsck.minix.c:1212
+#: disk-utils/fsck.minix.c:1169 disk-utils/fsck.minix.c:1224
 msgid "Unmark"
 msgstr "取消標記"
 
-#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1217
-#, c-format
-msgid "Zone %d: in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1174 disk-utils/fsck.minix.c:1229
+#, fuzzy, c-format
+msgid "Zone %lu: in use, counted=%d\n"
 msgstr "區域 %d: 使用中，數量=%d\n"
 
-#: disk-utils/fsck.minix.c:1165 disk-utils/fsck.minix.c:1220
-#, c-format
-msgid "Zone %d: not in use, counted=%d\n"
+#: disk-utils/fsck.minix.c:1177 disk-utils/fsck.minix.c:1232
+#, fuzzy, c-format
+msgid "Zone %lu: not in use, counted=%d\n"
 msgstr "區域 %d: 未被使用，數量=%d\n"
 
-#: disk-utils/fsck.minix.c:1265
+#: disk-utils/fsck.minix.c:1277
 msgid "bad inode size"
 msgstr "不當的 inode 大小"
 
-#: disk-utils/fsck.minix.c:1267
+#: disk-utils/fsck.minix.c:1279
 msgid "bad v2 inode size"
 msgstr "不當的 v2 inode 大小"
 
-#: disk-utils/fsck.minix.c:1293
+#: disk-utils/fsck.minix.c:1305
 msgid "need terminal for interactive repairs"
 msgstr "需要終端機以進行互動式修復"
 
-#: disk-utils/fsck.minix.c:1297
+#: disk-utils/fsck.minix.c:1309
 #, c-format
 msgid "unable to open '%s': %s"
 msgstr "無法開啟「%s」：%s"
 
-#: disk-utils/fsck.minix.c:1312
+#: disk-utils/fsck.minix.c:1324
 #, c-format
 msgid "%s is clean, no check.\n"
 msgstr "%s 已清除，不做檢查。\n"
 
-#: disk-utils/fsck.minix.c:1316
+#: disk-utils/fsck.minix.c:1328
 #, c-format
 msgid "Forcing filesystem check on %s.\n"
 msgstr "強制檢查 %s 檔案系統。\n"
 
-#: disk-utils/fsck.minix.c:1318
+#: disk-utils/fsck.minix.c:1330
 #, c-format
 msgid "Filesystem on %s is dirty, needs checking.\n"
 msgstr "%s 檔案系統不乾淨，需要檢查。\n"
 
-#: disk-utils/fsck.minix.c:1351
+#: disk-utils/fsck.minix.c:1363
 #, c-format
 msgid ""
 "\n"
@@ -894,12 +894,12 @@ msgstr ""
 "\n"
 "%6ld inodes 已使用 (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1356
+#: disk-utils/fsck.minix.c:1368
 #, c-format
 msgid "%6ld zones used (%ld%%)\n"
 msgstr "%6ld 區域已使用 (%ld%%)\n"
 
-#: disk-utils/fsck.minix.c:1358
+#: disk-utils/fsck.minix.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -922,7 +922,7 @@ msgstr ""
 "------\n"
 "%6d 檔案\n"
 
-#: disk-utils/fsck.minix.c:1371
+#: disk-utils/fsck.minix.c:1383
 #, c-format
 msgid ""
 "----------------------------\n"
@@ -1046,7 +1046,7 @@ msgstr "太多 inodes - 最大為 512"
 msgid "not enough space, need at least %llu blocks"
 msgstr "沒有足夠的空間，需要至少 %llu 區塊"
 
-#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2681
+#: disk-utils/mkfs.bfs.c:230 fdisk/fdisk.c:2680
 #, c-format
 msgid "Device: %s\n"
 msgstr "裝置：%s\n"
@@ -1216,10 +1216,8 @@ msgstr "%6.2f%% (%+ld 位元組)\t%s\n"
 
 #: disk-utils/mkfs.cramfs.c:668
 #, fuzzy, c-format
-msgid "closing file %s"
-msgstr ""
-"\n"
-"關閉檔案發生錯誤\n"
+msgid "cannot close file %s"
+msgstr "無法開啟檔案 '%s'"
 
 #: disk-utils/mkfs.cramfs.c:728
 #, fuzzy
@@ -1326,88 +1324,98 @@ msgstr ""
 "警告：裝置數量截短至 %u 位元。 這幾乎明確意味著\n"
 "某些裝置檔案將會發生錯誤。\n"
 
-#: disk-utils/mkfs.minix.c:148
+#: disk-utils/mkfs.minix.c:149
 #, fuzzy, c-format
 msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]"
 msgstr "用法：%s [-c | -l 檔名] [-nXX] [-iXX] /dev/名稱 [區塊]\n"
 
-#: disk-utils/mkfs.minix.c:170
+#: disk-utils/mkfs.minix.c:171
 #, c-format
 msgid "%s is mounted; will not make a filesystem here!"
 msgstr "%s 已掛載；在此將無法製作檔案系統！"
 
-#: disk-utils/mkfs.minix.c:194
+#: disk-utils/mkfs.minix.c:195
 #, fuzzy, c-format
 msgid "%s: seek to boot block failed  in write_tables"
 msgstr "在 write_tables 中搜尋啟動區塊時失敗"
 
-#: disk-utils/mkfs.minix.c:197
+#: disk-utils/mkfs.minix.c:198
 #, fuzzy, c-format
 msgid "%s: unable to clear boot sector"
 msgstr "無法清空開機磁區"
 
-#: disk-utils/mkfs.minix.c:199
+#: disk-utils/mkfs.minix.c:200
 #, fuzzy, c-format
 msgid "%s: seek failed in write_tables"
 msgstr "在 write_tables 中的尋找失敗"
 
-#: disk-utils/mkfs.minix.c:201
+#: disk-utils/mkfs.minix.c:203
 #, fuzzy, c-format
 msgid "%s: unable to write super-block"
 msgstr "無法寫入 super-block"
 
-#: disk-utils/mkfs.minix.c:203
+#: disk-utils/mkfs.minix.c:206
 #, fuzzy, c-format
 msgid "%s: unable to write inode map"
 msgstr "無法寫入 inode 對映"
 
-#: disk-utils/mkfs.minix.c:205
+#: disk-utils/mkfs.minix.c:209
 #, fuzzy, c-format
 msgid "%s: unable to write zone map"
 msgstr "無法寫入區域對映"
 
-#: disk-utils/mkfs.minix.c:207
+#: disk-utils/mkfs.minix.c:212
 #, fuzzy, c-format
 msgid "%s: unable to write inodes"
 msgstr "無法寫入 inodes"
 
-#: disk-utils/mkfs.minix.c:212
+#: disk-utils/mkfs.minix.c:217
 #, fuzzy, c-format
 msgid "%s: seek failed in write_block"
 msgstr "write_block 時搜尋失敗"
 
-#: disk-utils/mkfs.minix.c:214
+#: disk-utils/mkfs.minix.c:220
 #, fuzzy, c-format
 msgid "%s: write failed in write_block"
 msgstr "寫入 write_block 時失敗"
 
-#: disk-utils/mkfs.minix.c:223 disk-utils/mkfs.minix.c:298
-#: disk-utils/mkfs.minix.c:347
+#: disk-utils/mkfs.minix.c:229 disk-utils/mkfs.minix.c:304
+#: disk-utils/mkfs.minix.c:353
 #, fuzzy, c-format
 msgid "%s: too many bad blocks"
 msgstr "太多不良區塊"
 
-#: disk-utils/mkfs.minix.c:231
+#: disk-utils/mkfs.minix.c:237
 #, fuzzy, c-format
 msgid "%s: not enough good blocks"
 msgstr "良好區塊不足"
 
-#: disk-utils/mkfs.minix.c:477
+#: disk-utils/mkfs.minix.c:482
 #, fuzzy, c-format
 msgid "%s: unable to alloc buffer for superblock"
 msgstr "無法配置緩衝區給超區塊"
 
-#: disk-utils/mkfs.minix.c:521
+#: disk-utils/mkfs.minix.c:526
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffers for maps"
 msgstr "無法配置對映緩衝區"
 
-#: disk-utils/mkfs.minix.c:531
+#: disk-utils/mkfs.minix.c:536
 #, fuzzy, c-format
 msgid "%s: unable to allocate buffer for inodes"
 msgstr "無法配置 inodes 緩衝區"
 
-#: disk-utils/mkfs.minix.c:538
+#: disk-utils/mkfs.minix.c:539
+#, fuzzy, c-format
+msgid "%lu inodes\n"
+msgstr "%ld inodes\n"
+
+#: disk-utils/mkfs.minix.c:540
+#, fuzzy, c-format
+msgid "%lu blocks\n"
+msgstr "%ld 區塊\n"
+
+#: disk-utils/mkfs.minix.c:543
 #, c-format
 msgid ""
 "Maxsize=%ld\n"
@@ -1416,97 +1424,97 @@ msgstr ""
 "最大容量=%ld\n"
 "\n"
 
-#: disk-utils/mkfs.minix.c:551
+#: disk-utils/mkfs.minix.c:556
 #, fuzzy, c-format
 msgid "%s: seek failed during testing of blocks"
 msgstr "測試區塊的尋找失敗"
 
-#: disk-utils/mkfs.minix.c:558
+#: disk-utils/mkfs.minix.c:563
 #, c-format
 msgid "Weird values in do_check: probably bugs\n"
 msgstr "do_check 中出現異常值：可能錯誤\n"
 
-#: disk-utils/mkfs.minix.c:591
+#: disk-utils/mkfs.minix.c:596
 #, fuzzy, c-format
 msgid "%s: seek failed in check_blocks"
 msgstr "在 check_blocks 中的尋找失敗"
 
-#: disk-utils/mkfs.minix.c:601
+#: disk-utils/mkfs.minix.c:606
 #, fuzzy, c-format
 msgid "%s: bad blocks before data-area: cannot make fs"
 msgstr "資料區之前有不良區塊：無法製作檔案系統"
 
-#: disk-utils/mkfs.minix.c:608 disk-utils/mkfs.minix.c:634
+#: disk-utils/mkfs.minix.c:613 disk-utils/mkfs.minix.c:639
 #, c-format
 msgid "%d bad blocks\n"
 msgstr "%d 個不良區塊\n"
 
-#: disk-utils/mkfs.minix.c:610 disk-utils/mkfs.minix.c:636
+#: disk-utils/mkfs.minix.c:615 disk-utils/mkfs.minix.c:641
 #, c-format
 msgid "one bad block\n"
 msgstr "一個不良區塊\n"
 
-#: disk-utils/mkfs.minix.c:619
+#: disk-utils/mkfs.minix.c:624
 #, fuzzy, c-format
 msgid "%s: can't open file of bad blocks"
 msgstr "無法開啟不良區塊中的檔案"
 
-#: disk-utils/mkfs.minix.c:624
+#: disk-utils/mkfs.minix.c:629
 #, c-format
 msgid "badblock number input error on line %d\n"
 msgstr "損壞區塊編號輸入錯誤於第 %d 列\n"
 
-#: disk-utils/mkfs.minix.c:625
+#: disk-utils/mkfs.minix.c:630
 #, fuzzy, c-format
 msgid "%s: cannot read badblocks file"
 msgstr "無法讀取損壞區塊檔案"
 
-#: disk-utils/mkfs.minix.c:662 disk-utils/mkfs.minix.c:664
+#: disk-utils/mkfs.minix.c:667 disk-utils/mkfs.minix.c:669
 #, fuzzy, c-format
 msgid "%s: bad inode size"
 msgstr "不當的 inode 大小"
 
-#: disk-utils/mkfs.minix.c:713
+#: disk-utils/mkfs.minix.c:718
 #, c-format
 msgid "strtol error: number of blocks not specified"
 msgstr "strtol 錯誤：區塊數量尚未指定"
 
-#: disk-utils/mkfs.minix.c:732 mount/swapon.c:412 partx/partx.c:755
-#: sys-utils/fstrim.c:134
+#: disk-utils/mkfs.minix.c:737 mount/swapon.c:423 partx/partx.c:758
+#: sys-utils/fstrim.c:135
 #, c-format
 msgid "%s: stat failed"
 msgstr "%s：stat 失敗"
 
-#: disk-utils/mkfs.minix.c:739 login-utils/last.c:240 login-utils/vipw.c:154
-#: misc-utils/findmnt.c:685 misc-utils/wipefs.c:259 mount/swapon.c:210
-#: mount/swapon.c:295 mount/swapon.c:443 mount/swapon.c:607 mount/swapon.c:812
-#: partx/partx.c:803 sys-utils/fallocate.c:136 sys-utils/fsfreeze.c:101
-#: sys-utils/fstrim.c:140 text-utils/rev.c:129 text-utils/ul.c:230
+#: disk-utils/mkfs.minix.c:744 login-utils/last.c:240 login-utils/vipw.c:154
+#: misc-utils/findmnt.c:687 misc-utils/wipefs.c:260 mount/swapon.c:221
+#: mount/swapon.c:306 mount/swapon.c:454 mount/swapon.c:620 mount/swapon.c:825
+#: partx/partx.c:806 sys-utils/fallocate.c:138 sys-utils/fsfreeze.c:102
+#: sys-utils/fstrim.c:141 text-utils/rev.c:129 text-utils/ul.c:229
 #, c-format
 msgid "%s: open failed"
 msgstr "%s：開啟失敗"
 
-#: disk-utils/mkfs.minix.c:748
+#: disk-utils/mkfs.minix.c:753
 #, fuzzy, c-format
 msgid "%s: device is misaligned"
 msgstr "%s：%s：裝置忙碌中"
 
-#: disk-utils/mkfs.minix.c:751
+#: disk-utils/mkfs.minix.c:756
 #, c-format
 msgid "block size smaller than physical sector size of %s"
 msgstr "區段大小小於 %s 的實體磁區大小"
 
-#: disk-utils/mkfs.minix.c:755
+#: disk-utils/mkfs.minix.c:760
 #, c-format
 msgid "cannot determine size of %s"
 msgstr "無法決定 %s 的大小"
 
-#: disk-utils/mkfs.minix.c:764
+#: disk-utils/mkfs.minix.c:769
 #, c-format
 msgid "will not try to make filesystem on '%s'"
 msgstr "將不會試著於「%s」製作檔案系統"
 
-#: disk-utils/mkfs.minix.c:766
+#: disk-utils/mkfs.minix.c:771
 #, fuzzy, c-format
 msgid "%s: number of blocks too small"
 msgstr "區塊數量太小"
@@ -1835,7 +1843,7 @@ msgstr "標籤太長。將它截斷為「%s」"
 msgid "%s: failed to write label"
 msgstr "%s：無法寫入標籤"
 
-#: disk-utils/swaplabel.c:156 misc-utils/wipefs.c:302
+#: disk-utils/swaplabel.c:156
 #, c-format
 msgid ""
 "Usage: %s [options] <device>\n"
@@ -2174,7 +2182,7 @@ msgid "   Logical"
 msgstr "   邏輯的"
 
 #: fdisk/cfdisk.c:1906 fdisk/fdisk.c:1800 fdisk/fdisk.c:2138
-#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:614 fdisk/sfdisk.c:648
+#: fdisk/fdisksgilabel.c:228 fdisk/fdisksunlabel.c:615 fdisk/sfdisk.c:645
 msgid "Unknown"
 msgstr "未知"
 
@@ -2831,12 +2839,12 @@ msgid "BSD disklabel command (m for help): "
 msgstr "BSD 磁碟標籤命令 (m 以獲得說明)："
 
 #: fdisk/fdiskbsdlabel.c:283 fdisk/fdisk.c:2360 fdisk/fdisksgilabel.c:642
-#: fdisk/fdisksunlabel.c:424
+#: fdisk/fdisksunlabel.c:425
 #, c-format
 msgid "First %s"
 msgstr "起初 %s"
 
-#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:481
+#: fdisk/fdiskbsdlabel.c:290 fdisk/fdisksunlabel.c:482
 #, c-format
 msgid "Last %s or +size or +sizeM or +sizeK"
 msgstr "最後 %s 或 +size 或 +sizeM 或 +sizeK"
@@ -2982,7 +2990,7 @@ msgid "tracks/cylinder"
 msgstr "磁軌/磁柱"
 
 #: fdisk/fdiskbsdlabel.c:469 fdisk/fdisk.c:735 fdisk/fdisk.c:1622
-#: fdisk/sfdisk.c:958
+#: fdisk/sfdisk.c:955
 msgid "cylinders"
 msgstr "磁柱"
 
@@ -3049,12 +3057,12 @@ msgstr "已建立分割區的最大數量\n"
 msgid "This partition already exists.\n"
 msgstr "這個分割區已經存在。\n"
 
-#: fdisk/fdiskbsdlabel.c:756
+#: fdisk/fdiskbsdlabel.c:757
 #, c-format
 msgid "Warning: too many partitions (%d, maximum is %d).\n"
 msgstr "警告：太多分割區 (%d, 最大值為 %d)。\n"
 
-#: fdisk/fdiskbsdlabel.c:804
+#: fdisk/fdiskbsdlabel.c:805
 #, c-format
 msgid ""
 "\n"
@@ -3272,7 +3280,7 @@ msgstr "您必須設定"
 msgid "heads"
 msgstr "磁頭"
 
-#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:958
+#: fdisk/fdisk.c:733 fdisk/fdisk.c:1622 fdisk/sfdisk.c:955
 msgid "sectors"
 msgstr "磁區"
 
@@ -3713,7 +3721,7 @@ msgstr ""
 msgid "%*s Boot      Start         End      Blocks   Id  System\n"
 msgstr "%*s 開機      開始         結束      區塊   識別號  系統\n"
 
-#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:596
+#: fdisk/fdisk.c:2110 fdisk/fdisksgilabel.c:211 fdisk/fdisksunlabel.c:597
 msgid "Device"
 msgstr "所用裝置"
 
@@ -3797,7 +3805,7 @@ msgstr "配置的磁區總計 %llu 大於最大值 %llu\n"
 msgid "Remaining %lld unallocated %d-byte sectors\n"
 msgstr "尚餘 %lld 未配置的 %d-位元組磁區\n"
 
-#: fdisk/fdisk.c:2333 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:409
+#: fdisk/fdisk.c:2332 fdisk/fdisksgilabel.c:624 fdisk/fdisksunlabel.c:410
 #, c-format
 msgid "Partition %d is already defined.  Delete it before re-adding it.\n"
 msgstr "分割區 %d 已經定義。 在重新加入之前刪除它。\n"
@@ -3953,37 +3961,37 @@ msgstr ""
 msgid "Syncing disks.\n"
 msgstr "同步磁碟。\n"
 
-#: fdisk/fdisk.c:2698
+#: fdisk/fdisk.c:2697
 #, c-format
 msgid "Partition %d has no data area\n"
 msgstr "分割區 %d 沒有資料區域\n"
 
-#: fdisk/fdisk.c:2727
+#: fdisk/fdisk.c:2726
 msgid "New beginning of data"
 msgstr "新的資料開始部份"
 
-#: fdisk/fdisk.c:2743
+#: fdisk/fdisk.c:2742
 msgid "Expert command (m for help): "
 msgstr "專家命令 (m 以獲得說明)："
 
-#: fdisk/fdisk.c:2756
+#: fdisk/fdisk.c:2755
 msgid "Number of cylinders"
 msgstr "磁柱數量"
 
-#: fdisk/fdisk.c:2781
+#: fdisk/fdisk.c:2780
 msgid "Number of heads"
 msgstr "磁頭數量"
 
-#: fdisk/fdisk.c:2808
+#: fdisk/fdisk.c:2807
 msgid "Number of sectors"
 msgstr "磁區數量"
 
-#: fdisk/fdisk.c:2810
+#: fdisk/fdisk.c:2809
 #, c-format
 msgid "Warning: setting sector offset for DOS compatiblity\n"
 msgstr "警告：設定磁區偏移以達到 DOS 相容性\n"
 
-#: fdisk/fdisk.c:2869
+#: fdisk/fdisk.c:2868
 #, c-format
 msgid ""
 "\n"
@@ -3996,48 +4004,48 @@ msgstr ""
 "GNU Parted。\n"
 "\n"
 
-#: fdisk/fdisk.c:2891
+#: fdisk/fdisk.c:2890
 #, c-format
 msgid "Disk %s doesn't contain a valid partition table\n"
 msgstr "磁碟 %s 不包含有效的分割表\n"
 
-#: fdisk/fdisk.c:2902
+#: fdisk/fdisk.c:2901
 #, c-format
 msgid "Cannot open %s\n"
 msgstr "無法開啟 %s\n"
 
-#: fdisk/fdisk.c:2921 fdisk/sfdisk.c:2738
+#: fdisk/fdisk.c:2920 fdisk/sfdisk.c:2715
 #, c-format
 msgid "cannot open %s\n"
 msgstr "無法開啟 %s\n"
 
-#: fdisk/fdisk.c:2946
+#: fdisk/fdisk.c:2944
 #, c-format
 msgid "%c: unknown command\n"
 msgstr "%c: 不明的命令\n"
 
-#: fdisk/fdisk.c:3021
+#: fdisk/fdisk.c:3019
 #, c-format
 msgid "This kernel finds the sector size itself - -b option ignored\n"
 msgstr "內核自行找到磁區大小 - -b 選項忽略\n"
 
-#: fdisk/fdisk.c:3025
+#: fdisk/fdisk.c:3023
 #, c-format
 msgid ""
 "Warning: the -b (set sector size) option should be used with one specified "
 "device\n"
 msgstr "警告：-b (設定磁區大小) 選項應該與一個指定裝置共同使用\n"
 
-#: fdisk/fdisk.c:3085
+#: fdisk/fdisk.c:3083
 #, c-format
 msgid "Detected an OSF/1 disklabel on %s, entering disklabel mode.\n"
 msgstr "於 %s 偵測到 OSF/1 磁碟標籤，進入磁碟標籤模式。\n"
 
-#: fdisk/fdisk.c:3095
+#: fdisk/fdisk.c:3093
 msgid "Command (m for help): "
 msgstr "命令 (m 以獲得說明)："
 
-#: fdisk/fdisk.c:3111
+#: fdisk/fdisk.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4046,16 +4054,16 @@ msgstr ""
 "\n"
 "目前的啟動檔案為：%s\n"
 
-#: fdisk/fdisk.c:3113
+#: fdisk/fdisk.c:3111
 msgid "Please enter the name of the new boot file: "
 msgstr "請輸入新的啟動檔案名稱："
 
-#: fdisk/fdisk.c:3115
+#: fdisk/fdisk.c:3113
 #, c-format
 msgid "Boot file unchanged\n"
 msgstr "啟動檔案未變更\n"
 
-#: fdisk/fdisk.c:3188
+#: fdisk/fdisk.c:3186
 #, c-format
 msgid ""
 "\n"
@@ -4372,9 +4380,9 @@ msgid "\tYou have chosen an unusual boot file name.\n"
 msgstr "\t您選擇了一個不尋常的啟動檔案名稱。\n"
 
 #: fdisk/fdisksgilabel.c:536
-#, c-format
-msgid "Sorry You may change the Tag of non-empty partitions.\n"
-msgstr "抱歉，您也許變更了非空白分割區的標記。\n"
+#, fuzzy, c-format
+msgid "Sorry, only for non-empty partitions you can change the tag.\n"
+msgstr "抱歉，只有系統管理者可以變更系統時鐘。\n"
 
 #: fdisk/fdisksgilabel.c:542
 msgid ""
@@ -4390,7 +4398,7 @@ msgstr ""
 "只有「SGI 卷冊」整個磁碟區段的話，也許會對此有所妨害。\n"
 "如果您確定將這個分割區貼上不同的標籤，就輸入 YES。\n"
 
-#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:547
+#: fdisk/fdisksgilabel.c:547 fdisk/fdisksunlabel.c:548
 msgid "YES\n"
 msgstr "YES\n"
 
@@ -4585,7 +4593,7 @@ msgstr "未使用的間隙 - 磁區 0-%d\n"
 msgid "Unused gap - sectors %d-%d\n"
 msgstr "未使用的間隙 - 磁區 %d-%d\n"
 
-#: fdisk/fdisksunlabel.c:419
+#: fdisk/fdisksunlabel.c:420
 #, c-format
 msgid ""
 "Other partitions already cover the whole disk.\n"
@@ -4594,7 +4602,7 @@ msgstr ""
 "其他分割區已經涵蓋整個磁碟。\n"
 "請於重試之前刪除部份或縮減它們。\n"
 
-#: fdisk/fdisksunlabel.c:442
+#: fdisk/fdisksunlabel.c:443
 #, c-format
 msgid ""
 "It is highly recommended that the third partition covers the whole disk\n"
@@ -4603,12 +4611,12 @@ msgstr ""
 "強烈建議第三分割區包括\n"
 "整個磁碟並且為「整顆磁碟」類型\n"
 
-#: fdisk/fdisksunlabel.c:470
+#: fdisk/fdisksunlabel.c:471
 #, c-format
 msgid "Sector %d is already allocated\n"
 msgstr "磁區 %d 已經被配置\n"
 
-#: fdisk/fdisksunlabel.c:500
+#: fdisk/fdisksunlabel.c:501
 #, c-format
 msgid ""
 "You haven't covered the whole disk with the 3rd partition, but your value\n"
@@ -4619,7 +4627,7 @@ msgstr ""
 "%d %s 涵蓋某些其他的分割區。您的輸入值已變更\n"
 "為 %d %s\n"
 
-#: fdisk/fdisksunlabel.c:527
+#: fdisk/fdisksunlabel.c:528
 #, c-format
 msgid ""
 "If you want to maintain SunOS/Solaris compatibility, consider leaving this\n"
@@ -4628,7 +4636,7 @@ msgstr ""
 "如果您要維持 SunOS/Solaris 的相容性，請考慮保持這個\n"
 "分割區為整個磁碟 (5)，開始於 0, 具備 %u 磁區\n"
 
-#: fdisk/fdisksunlabel.c:542
+#: fdisk/fdisksunlabel.c:543
 msgid ""
 "It is highly recommended that the partition at offset 0\n"
 "is UFS, EXT2FS filesystem or SunOS swap. Putting Linux swap\n"
@@ -4642,7 +4650,7 @@ msgstr ""
 "如果您很確定想要該分割區被\n"
 "標示為 82 (Linux 交換區) 就輸入 YES："
 
-#: fdisk/fdisksunlabel.c:574
+#: fdisk/fdisksunlabel.c:575
 #, c-format
 msgid ""
 "\n"
@@ -4663,7 +4671,7 @@ msgstr ""
 "單位 = %s 之於 %d * 512 位元組\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:590
+#: fdisk/fdisksunlabel.c:591
 #, c-format
 msgid ""
 "\n"
@@ -4676,28 +4684,28 @@ msgstr ""
 "單位 = %s 之於 %d * 512 位元組\n"
 "\n"
 
-#: fdisk/fdisksunlabel.c:595
+#: fdisk/fdisksunlabel.c:596
 #, c-format
 msgid "%*s Flag    Start       End    Blocks   Id  System\n"
 msgstr "%*s 旗標    開始       結束    區塊   識別號  系統\n"
 
-#: fdisk/fdisksunlabel.c:623
+#: fdisk/fdisksunlabel.c:624
 msgid "Number of alternate cylinders"
 msgstr "替代磁柱數量"
 
-#: fdisk/fdisksunlabel.c:635
+#: fdisk/fdisksunlabel.c:636
 msgid "Extra sectors per cylinder"
 msgstr "每磁柱的額外磁區"
 
-#: fdisk/fdisksunlabel.c:642
+#: fdisk/fdisksunlabel.c:643
 msgid "Interleave factor"
 msgstr "交錯因子"
 
-#: fdisk/fdisksunlabel.c:649
+#: fdisk/fdisksunlabel.c:650
 msgid "Rotation speed (rpm)"
 msgstr "旋轉速度 (rpm)"
 
-#: fdisk/fdisksunlabel.c:656
+#: fdisk/fdisksunlabel.c:657
 msgid "Number of physical cylinders"
 msgstr "實體磁柱數量"
 
@@ -5154,7 +5162,7 @@ msgstr "磁碟 %s: 無法取得結構參數\n"
 msgid "Disk %s: cannot get size\n"
 msgstr "磁碟 %s: 無法取得大小\n"
 
-#: fdisk/sfdisk.c:493
+#: fdisk/sfdisk.c:492
 #, c-format
 msgid ""
 "Warning: start=%lu - this looks like a partition rather than\n"
@@ -5165,22 +5173,22 @@ msgstr ""
 "整個磁碟。於其上使用 fdisk 可能不具意義的。\n"
 "[如果您確實想要如此，就使用 --force 選項]\n"
 
-#: fdisk/sfdisk.c:501
+#: fdisk/sfdisk.c:500
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu heads\n"
 msgstr "警告：HDIO_GETGEO 表示具有 %lu 個磁頭\n"
 
-#: fdisk/sfdisk.c:504
+#: fdisk/sfdisk.c:503
 #, c-format
 msgid "Warning: HDIO_GETGEO says that there are %lu sectors\n"
 msgstr "警告：HDIO_GETGEO 表示具有 %lu 段磁區\n"
 
-#: fdisk/sfdisk.c:509
+#: fdisk/sfdisk.c:507
 #, c-format
 msgid "Warning: BLKGETSIZE/HDIO_GETGEO says that there are %lu cylinders\n"
 msgstr "警告：BLKGETSIZE/HDIO_GETGEO 表示具有 %lu 圈磁柱\n"
 
-#: fdisk/sfdisk.c:515
+#: fdisk/sfdisk.c:512
 #, c-format
 msgid ""
 "Warning: unlikely number of sectors (%lu) - usually at most 63\n"
@@ -5189,7 +5197,7 @@ msgstr ""
 "警告：不太可能的磁區數量 (%lu) - 通常最多為 63\n"
 "這將對於使用 C/H/S 定址的軟體造成問題。\n"
 
-#: fdisk/sfdisk.c:519
+#: fdisk/sfdisk.c:516
 #, c-format
 msgid ""
 "\n"
@@ -5198,27 +5206,27 @@ msgstr ""
 "\n"
 "磁碟 %s: %lu 磁柱，%lu 磁頭，%lu 磁區/磁軌\n"
 
-#: fdisk/sfdisk.c:605
+#: fdisk/sfdisk.c:602
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for head: %lu (should be in 0-%lu)\n"
 msgstr "分割區 %2$s 的 %1$s 有不可能的磁頭數值：%3$lu (應該介於 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:610
+#: fdisk/sfdisk.c:607
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for sector: %lu (should be in 1-"
 "%lu)\n"
 msgstr "分割區 %1$s 的 %2$s 有不可能的磁區數值：%3$lu (應該介於 1-%4$lu)\n"
 
-#: fdisk/sfdisk.c:615
+#: fdisk/sfdisk.c:612
 #, c-format
 msgid ""
 "%s of partition %s has impossible value for cylinders: %lu (should be in 0-"
 "%lu)\n"
 msgstr "分割區 %1$s 的 %2$s 有不可能的磁柱數值：%3$lu (應該介於 0-%4$lu)\n"
 
-#: fdisk/sfdisk.c:655
+#: fdisk/sfdisk.c:652
 #, c-format
 msgid ""
 "Id  Name\n"
@@ -5227,12 +5235,12 @@ msgstr ""
 "識別號  名稱\n"
 "\n"
 
-#: fdisk/sfdisk.c:821
+#: fdisk/sfdisk.c:818
 #, c-format
 msgid "Re-reading the partition table ...\n"
 msgstr "重新讀取分割表…\n"
 
-#: fdisk/sfdisk.c:826
+#: fdisk/sfdisk.c:823
 msgid ""
 "The command to re-read the partition table failed.\n"
 "Run partprobe(8), kpartx(8) or reboot your system now,\n"
@@ -5241,26 +5249,26 @@ msgstr ""
 "重新讀取分割表的命令失敗。\n"
 "在使用 mkfs 之前，請執行 partprobe(8),kpartx(8) 或將您的系統重新開機\n"
 
-#: fdisk/sfdisk.c:834
+#: fdisk/sfdisk.c:831
 #, c-format
 msgid "Error closing %s\n"
 msgstr "關閉 %s 時發生錯誤\n"
 
-#: fdisk/sfdisk.c:875
+#: fdisk/sfdisk.c:872
 #, c-format
 msgid "%s: no such partition\n"
 msgstr "%s：無此類分割區\n"
 
-#: fdisk/sfdisk.c:898
+#: fdisk/sfdisk.c:895
 msgid "unrecognized format - using sectors\n"
 msgstr "無法辨識的格式 - 使用磁區數\n"
 
-#: fdisk/sfdisk.c:957
+#: fdisk/sfdisk.c:954
 #, c-format
 msgid "unimplemented format - using %s\n"
 msgstr "尚未實作的格式 - 使用 %s\n"
 
-#: fdisk/sfdisk.c:961
+#: fdisk/sfdisk.c:958
 #, c-format
 msgid ""
 "Units = cylinders of %lu bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5269,12 +5277,12 @@ msgstr ""
 "單位 = %lu 位元組的磁柱，1024 位元組的區塊，從 %d 起計數\n"
 "\n"
 
-#: fdisk/sfdisk.c:964
+#: fdisk/sfdisk.c:960
 #, c-format
 msgid "   Device Boot Start     End   #cyls    #blocks   Id  System\n"
 msgstr "   裝置開機起始     結束   磁柱數    區塊數   識別號  系統\n"
 
-#: fdisk/sfdisk.c:969
+#: fdisk/sfdisk.c:965
 #, c-format
 msgid ""
 "Units = sectors of 512 bytes, counting from %d\n"
@@ -5283,12 +5291,12 @@ msgstr ""
 "單位 = 512 位元組的磁區，從 %d 起計數\n"
 "\n"
 
-#: fdisk/sfdisk.c:971
+#: fdisk/sfdisk.c:967
 #, c-format
 msgid "   Device Boot    Start       End   #sectors  Id  System\n"
 msgstr "   裝置開機    起始       結束   磁區數  識別號  系統\n"
 
-#: fdisk/sfdisk.c:974
+#: fdisk/sfdisk.c:970
 #, c-format
 msgid ""
 "Units = blocks of 1024 bytes, counting from %d\n"
@@ -5297,12 +5305,12 @@ msgstr ""
 "單位 = 1024 位元組的區塊，從 %d 起計數\n"
 "\n"
 
-#: fdisk/sfdisk.c:976
+#: fdisk/sfdisk.c:972
 #, c-format
 msgid "   Device Boot   Start       End    #blocks   Id  System\n"
 msgstr "   裝置開機   起始       結束    區塊數   識別號  系統\n"
 
-#: fdisk/sfdisk.c:979
+#: fdisk/sfdisk.c:975
 #, c-format
 msgid ""
 "Units = mebibytes of 1048576 bytes, blocks of 1024 bytes, counting from %d\n"
@@ -5311,31 +5319,31 @@ msgstr ""
 "單位 = 1048576 位元組的 mebibytes，1024 位元組的區塊，從 %d 起計數\n"
 "\n"
 
-#: fdisk/sfdisk.c:982
+#: fdisk/sfdisk.c:977
 #, c-format
 msgid "   Device Boot Start   End    MiB    #blocks   Id  System\n"
 msgstr "   裝置開機起始   結束    MiB    區塊數   識別號  系統\n"
 
-#: fdisk/sfdisk.c:1142
+#: fdisk/sfdisk.c:1136
 #, c-format
 msgid "\t\tstart: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t起始：(c,h,s) 預期為 (%ld,%ld,%ld) 辨認為 (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1150
+#: fdisk/sfdisk.c:1143
 #, c-format
 msgid "\t\tend: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "\t\t結束：(c,h,s) 預期為 (%ld,%ld,%ld) 辨認為 (%ld,%ld,%ld)\n"
 
-#: fdisk/sfdisk.c:1154
+#: fdisk/sfdisk.c:1146
 #, c-format
 msgid "partition ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "分割區結束於磁柱 %ld，位於磁碟末端之後\n"
 
-#: fdisk/sfdisk.c:1164
+#: fdisk/sfdisk.c:1156
 msgid "No partitions found\n"
 msgstr "找不到分割區\n"
 
-#: fdisk/sfdisk.c:1167
+#: fdisk/sfdisk.c:1159
 #, c-format
 msgid ""
 "Warning: The partition table looks like it was made\n"
@@ -5346,51 +5354,41 @@ msgstr ""
 "用於 C/H/S=*/%ld/%ld (而非 %ld/%ld/%ld)。\n"
 "我將會假設該結構參數以用於此列表。\n"
 
-#: fdisk/sfdisk.c:1215
+#: fdisk/sfdisk.c:1207
 msgid "no partition table present.\n"
 msgstr "分割表不存在。\n"
 
-#: fdisk/sfdisk.c:1217
+#: fdisk/sfdisk.c:1209
 #, c-format
 msgid "strange, only %d partitions defined.\n"
 msgstr "奇怪，只有定義 %d 個分割區。\n"
 
-#: fdisk/sfdisk.c:1227
+#: fdisk/sfdisk.c:1218
 #, c-format
 msgid "Warning: partition %s has size 0 but is not marked Empty\n"
 msgstr "警告：分割區 %s 大小為 0 但是並未標記為空\n"
 
-#: fdisk/sfdisk.c:1230
+#: fdisk/sfdisk.c:1221
 #, c-format
 msgid "Warning: partition %s has size 0 and is bootable\n"
 msgstr "警告：分割區 %s 大小為 0 且為可開機\n"
 
-#: fdisk/sfdisk.c:1234
+#: fdisk/sfdisk.c:1224
 #, c-format
 msgid "Warning: partition %s has size 0 and nonzero start\n"
 msgstr "警告：分割區 %s 大小為 0 且以非零值開始\n"
 
-#: fdisk/sfdisk.c:1246
-#, c-format
-msgid "Warning: partition %s "
-msgstr "警告：分割區 %s "
-
-#: fdisk/sfdisk.c:1247
-#, c-format
-msgid "is not contained in partition %s\n"
+#: fdisk/sfdisk.c:1236
+#, fuzzy, c-format
+msgid "Warning: partition %s is not contained in partition %s\n"
 msgstr "並未包含於分割區 %s 中\n"
 
-#: fdisk/sfdisk.c:1258
-#, c-format
-msgid "Warning: partitions %s "
-msgstr "警告：分割區 %s "
-
-#: fdisk/sfdisk.c:1259
-#, c-format
-msgid "and %s overlap\n"
-msgstr "和 %s 重疊\n"
+#: fdisk/sfdisk.c:1248
+#, fuzzy, c-format
+msgid "Warning: partitions %s and %s overlap\n"
+msgstr "警告：分割區 %d 是空的\n"
 
-#: fdisk/sfdisk.c:1270
+#: fdisk/sfdisk.c:1260
 #, c-format
 msgid ""
 "Warning: partition %s contains part of the partition table (sector %lu),\n"
@@ -5399,17 +5397,17 @@ msgstr ""
 "警告：分割區 %s 含有部分的分割表 (磁區 %lu)，\n"
 "當它填滿後將會被損毀\n"
 
-#: fdisk/sfdisk.c:1283
+#: fdisk/sfdisk.c:1273
 #, c-format
 msgid "Warning: partition %s starts at sector 0\n"
 msgstr "警告：分割區 %s 開始於磁區 0\n"
 
-#: fdisk/sfdisk.c:1289
+#: fdisk/sfdisk.c:1278
 #, c-format
 msgid "Warning: partition %s extends past end of disk\n"
 msgstr "警告：分割區 %s 延伸超過磁碟末端\n"
 
-#: fdisk/sfdisk.c:1306
+#: fdisk/sfdisk.c:1294
 msgid ""
 "Among the primary partitions, at most one can be extended\n"
 " (although this is not a problem under Linux)\n"
@@ -5417,17 +5415,17 @@ msgstr ""
 "在主要分割區之中，最多只能有一個是擴充分割區\n"
 "(雖然這在 Linux 之下並不是個問題)\n"
 
-#: fdisk/sfdisk.c:1326
+#: fdisk/sfdisk.c:1314
 #, c-format
 msgid "Warning: partition %s does not start at a cylinder boundary\n"
 msgstr "警告：分割區 %s 並非啟始於磁柱邊界\n"
 
-#: fdisk/sfdisk.c:1332
+#: fdisk/sfdisk.c:1320
 #, c-format
 msgid "Warning: partition %s does not end at a cylinder boundary\n"
 msgstr "警告：分割區 %s 並非結束於磁柱邊界\n"
 
-#: fdisk/sfdisk.c:1352
+#: fdisk/sfdisk.c:1339
 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"
@@ -5435,7 +5433,7 @@ msgstr ""
 "警告：超過一個的主要分割區被標記為可開機的 (作用中)\n"
 "這個對 LILO 而言不成問題，但是 DOS MBR 將無法以這個磁碟開機。\n"
 
-#: fdisk/sfdisk.c:1360
+#: fdisk/sfdisk.c:1346
 msgid ""
 "Warning: usually one can boot from primary partitions only\n"
 "LILO disregards the `bootable' flag.\n"
@@ -5443,7 +5441,7 @@ msgstr ""
 "警告：通常只可以從主要分割區開機\n"
 "LILO 並不理會「可開機的」旗標。\n"
 
-#: fdisk/sfdisk.c:1367
+#: fdisk/sfdisk.c:1352
 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"
@@ -5451,32 +5449,32 @@ msgstr ""
 "警告：沒有主要分割區被標記為可開機的 (作用中)\n"
 "這個對 LILO 而言不成問題，但是 DOS MBR 將無法以這個磁碟開機。\n"
 
-#: fdisk/sfdisk.c:1381
+#: fdisk/sfdisk.c:1366
 msgid "start"
 msgstr "啟始"
 
-#: fdisk/sfdisk.c:1385
+#: fdisk/sfdisk.c:1369
 #, c-format
 msgid ""
 "partition %s: start: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr ""
 "分割區 %s：啟始：(c,h,s) 預期為 (%ld ,%ld ,%ld) 但找到 (%ld ,%ld ,%ld)\n"
 
-#: fdisk/sfdisk.c:1391
+#: fdisk/sfdisk.c:1375
 msgid "end"
 msgstr "結束"
 
-#: fdisk/sfdisk.c:1395
+#: fdisk/sfdisk.c:1378
 #, c-format
 msgid "partition %s: end: (c,h,s) expected (%ld,%ld,%ld) found (%ld,%ld,%ld)\n"
 msgstr "分割區 %s：結束：(c,h,s) 預期為 (%ld ,%ld ,%ld) 找到 (%ld ,%ld ,%ld)\n"
 
-#: fdisk/sfdisk.c:1399
+#: fdisk/sfdisk.c:1381
 #, c-format
 msgid "partition %s ends on cylinder %ld, beyond the end of the disk\n"
 msgstr "分割區 %s 結束於磁柱 %ld，位於磁碟的末端之後\n"
 
-#: fdisk/sfdisk.c:1424
+#: fdisk/sfdisk.c:1406
 #, c-format
 msgid ""
 "Warning: shifted start of the extd partition from %ld to %ld\n"
@@ -5485,7 +5483,7 @@ msgstr ""
 "警告：擴充分割區的啟始從 %ld 位移到 %ld\n"
 "(只用於列表目的。請不要變更它的內容。)\n"
 
-#: fdisk/sfdisk.c:1429
+#: fdisk/sfdisk.c:1411
 msgid ""
 "Warning: extended partition does not start at a cylinder boundary.\n"
 "DOS and Linux will interpret the contents differently.\n"
@@ -5493,131 +5491,131 @@ msgstr ""
 "警告：擴充分割區非啟始於磁柱邊界。\n"
 "DOS 和 Linux 將對內容有不同解譯。\n"
 
-#: fdisk/sfdisk.c:1447 fdisk/sfdisk.c:1524
+#: fdisk/sfdisk.c:1429 fdisk/sfdisk.c:1506
 #, c-format
 msgid "too many partitions - ignoring those past nr (%d)\n"
 msgstr "太多分割區 - 忽略那些過去的 nr (%d)\n"
 
-#: fdisk/sfdisk.c:1462
+#: fdisk/sfdisk.c:1444
 msgid "tree of partitions?\n"
 msgstr "分割區的樹狀圖？\n"
 
-#: fdisk/sfdisk.c:1570
+#: fdisk/sfdisk.c:1552
 msgid "detected Disk Manager - unable to handle that\n"
 msgstr "偵測到磁碟管理員 - 無法處理它\n"
 
-#: fdisk/sfdisk.c:1578
+#: fdisk/sfdisk.c:1560
 msgid "DM6 signature found - giving up\n"
 msgstr "找到 DM6 簽章 - 放棄\n"
 
-#: fdisk/sfdisk.c:1598
+#: fdisk/sfdisk.c:1580
 msgid "strange..., an extended partition of size 0?\n"
 msgstr "很奇怪…，大小為 0 的擴充分割區？\n"
 
-#: fdisk/sfdisk.c:1605 fdisk/sfdisk.c:1616
+#: fdisk/sfdisk.c:1587 fdisk/sfdisk.c:1598
 msgid "strange..., a BSD partition of size 0?\n"
 msgstr "很奇怪…，大小為 0 的 BSD 分割區？\n"
 
-#: fdisk/sfdisk.c:1659
+#: fdisk/sfdisk.c:1641
 #, c-format
 msgid " %s: unrecognized partition table type\n"
 msgstr " %s: 無法辨識的分割表類型\n"
 
-#: fdisk/sfdisk.c:1671
+#: fdisk/sfdisk.c:1653
 msgid "-n flag was given: Nothing changed\n"
 msgstr "-n 旗標已給定：沒有改變任何東西\n"
 
-#: fdisk/sfdisk.c:1688
+#: fdisk/sfdisk.c:1670
 msgid "Failed saving the old sectors - aborting\n"
 msgstr "儲存舊的磁區時失敗 - 放棄\n"
 
-#: fdisk/sfdisk.c:1693 fdisk/sfdisk.c:1698
+#: fdisk/sfdisk.c:1675 fdisk/sfdisk.c:1680
 #, c-format
 msgid "Failed writing the partition on %s\n"
 msgstr "寫入分割區於 %s 時失敗\n"
 
-#: fdisk/sfdisk.c:1776
+#: fdisk/sfdisk.c:1758
 msgid "long or incomplete input line - quitting\n"
 msgstr "太長或不完整的輸入列 - 離開\n"
 
-#: fdisk/sfdisk.c:1812
+#: fdisk/sfdisk.c:1794
 #, c-format
 msgid "input error: `=' expected after %s field\n"
 msgstr "輸入錯誤：預期「=」位於 %s 欄位之後\n"
 
-#: fdisk/sfdisk.c:1820
+#: fdisk/sfdisk.c:1801
 #, c-format
 msgid "input error: unexpected character %c after %s field\n"
 msgstr "輸入錯誤：未預期的字元 %c 位於 %s 欄位之後\n"
 
-#: fdisk/sfdisk.c:1826
+#: fdisk/sfdisk.c:1807
 #, c-format
 msgid "unrecognized input: %s\n"
 msgstr "無法辨識的輸入：%s\n"
 
-#: fdisk/sfdisk.c:1867
+#: fdisk/sfdisk.c:1848
 msgid "number too big\n"
 msgstr "數字太大\n"
 
-#: fdisk/sfdisk.c:1871
+#: fdisk/sfdisk.c:1852
 msgid "trailing junk after number\n"
 msgstr "數字之後尾隨無用物\n"
 
-#: fdisk/sfdisk.c:1995
+#: fdisk/sfdisk.c:1976
 msgid "no room for partition descriptor\n"
 msgstr "沒有空間可用於分割區描述\n"
 
-#: fdisk/sfdisk.c:2028
+#: fdisk/sfdisk.c:2009
 msgid "cannot build surrounding extended partition\n"
 msgstr "無法圍繞擴充分割區建立\n"
 
-#: fdisk/sfdisk.c:2079
+#: fdisk/sfdisk.c:2060
 msgid "too many input fields\n"
 msgstr "太多輸入欄位\n"
 
-#: fdisk/sfdisk.c:2113
+#: fdisk/sfdisk.c:2094
 msgid "No room for more\n"
 msgstr "沒有空間可容納更多\n"
 
-#: fdisk/sfdisk.c:2132
+#: fdisk/sfdisk.c:2113
 msgid "Illegal type\n"
 msgstr "不合法的類型\n"
 
-#: fdisk/sfdisk.c:2167
+#: fdisk/sfdisk.c:2147
 #, c-format
 msgid "Warning: given size (%lu) exceeds max allowable size (%lu)\n"
 msgstr "警告：給定的大小 (%lu) 超出所允許的最大值 (%lu)\n"
 
-#: fdisk/sfdisk.c:2173
+#: fdisk/sfdisk.c:2153
 msgid "Warning: empty partition\n"
 msgstr "警告：空的分割區\n"
 
-#: fdisk/sfdisk.c:2187
+#: fdisk/sfdisk.c:2167
 #, c-format
 msgid "Warning: bad partition start (earliest %lu)\n"
 msgstr "警告：不當的分割區啟始 (最先 %lu)\n"
 
-#: fdisk/sfdisk.c:2200
+#: fdisk/sfdisk.c:2180
 msgid "unrecognized bootable flag - choose - or *\n"
 msgstr "無法辨識的可開機旗標 - 選擇 - 或 *\n"
 
-#: fdisk/sfdisk.c:2217 fdisk/sfdisk.c:2231
+#: fdisk/sfdisk.c:2197 fdisk/sfdisk.c:2211
 msgid "partial c,h,s specification?\n"
 msgstr "部份 c,h,s 規格？\n"
 
-#: fdisk/sfdisk.c:2242
+#: fdisk/sfdisk.c:2222
 msgid "Extended partition not where expected\n"
 msgstr "擴充分割區不在預期的位置\n"
 
-#: fdisk/sfdisk.c:2274
+#: fdisk/sfdisk.c:2254
 msgid "bad input\n"
 msgstr "不當的輸入\n"
 
-#: fdisk/sfdisk.c:2297
+#: fdisk/sfdisk.c:2277
 msgid "too many partitions\n"
 msgstr "太多分割區\n"
 
-#: fdisk/sfdisk.c:2331
+#: fdisk/sfdisk.c:2310
 msgid ""
 "Input in the following format; absent fields get a default value.\n"
 "<start> <size> <type [E,S,L,X,hex]> <bootable [-,*]> <c,h,s> <c,h,s>\n"
@@ -5627,99 +5625,178 @@ msgstr ""
 "<啟始> <大小> <類型 [E,S,L,X, 十六進位]> <可開機 [-,*]> <c,h,s> <c,h,s>\n"
 "常常您只有需要指定 <啟始> 和 <大小> (也許還有 <類型>)。\n"
 
-#: fdisk/sfdisk.c:2352
-#, fuzzy, c-format
+#: fdisk/sfdisk.c:2330 getopt/getopt.c:314 hwclock/hwclock.c:1374
+#: misc-utils/cal.c:786 misc-utils/logger.c:138 misc-utils/look.c:366
+#: misc-utils/mcookie.c:66 misc-utils/namei.c:411 misc-utils/rename.c:64
+#: misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33 misc-utils/whereis.c:132
+#: misc-utils/wipefs.c:303 mount/lomount.c:1015 mount/swapon.c:103
+#: mount/swapon.c:124 partx/partx.c:581 sys-utils/dmesg.c:132
+#: sys-utils/fallocate.c:53 sys-utils/flock.c:65 sys-utils/fsfreeze.c:40
+#: sys-utils/fstrim.c:55 sys-utils/ipcmk.c:86 sys-utils/ldattach.c:149
+#: sys-utils/lscpu.c:1036 sys-utils/mountpoint.c:79 sys-utils/renice.c:54
+#: sys-utils/rtcwake.c:86 sys-utils/unshare.c:57 term-utils/mesg.c:68
+#: term-utils/script.c:130 term-utils/scriptreplay.c:39
+#: term-utils/setterm.c:675 term-utils/wall.c:87 term-utils/write.c:78
+#, fuzzy
 msgid ""
 "\n"
 "Usage:\n"
-"  %s [options] device [...]\n"
-msgstr "用法：%s [選項] 裝置…\n"
+msgstr "用法:\n"
 
-#: fdisk/sfdisk.c:2355
+#: fdisk/sfdisk.c:2332
 #, fuzzy, c-format
-msgid "Device is something like /dev/hda or /dev/sda\n"
-msgstr "裝置：諸如 /dev/hda 或 /dev/sda"
+msgid " %s [options] <device> [...]\n"
+msgstr "用法：%s [選項] 裝置…\n"
 
-#: fdisk/sfdisk.c:2357
+#: fdisk/sfdisk.c:2334 getopt/getopt.c:322 hwclock/hwclock.c:1394
+#: misc-utils/cal.c:791 misc-utils/logger.c:142 misc-utils/look.c:370
+#: misc-utils/mcookie.c:70 misc-utils/namei.c:415 misc-utils/rename.c:69
+#: misc-utils/uuidd.c:58 misc-utils/uuidgen.c:37 misc-utils/whereis.c:136
+#: misc-utils/wipefs.c:307 mount/lomount.c:1026 mount/swapon.c:106
+#: mount/swapon.c:127 partx/partx.c:586 sys-utils/dmesg.c:136
+#: sys-utils/fallocate.c:57 sys-utils/flock.c:71 sys-utils/fsfreeze.c:44
+#: sys-utils/fstrim.c:59 sys-utils/ipcmk.c:90 sys-utils/lscpu.c:1040
+#: sys-utils/mountpoint.c:84 sys-utils/renice.c:61 sys-utils/rtcwake.c:90
+#: sys-utils/unshare.c:61 term-utils/mesg.c:72 term-utils/script.c:134
+#: term-utils/scriptreplay.c:44 term-utils/setterm.c:679 term-utils/wall.c:91
+#: term-utils/write.c:83 text-utils/column.c:91
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-"  -s, --show-size         list size of a partition\n"
-"  -c, --id                change or print partition Id\n"
-"      --change-id         change Id\n"
-"      --print-id          print Id\n"
-"  -l, --list              list partitions of each device\n"
-"  -d, --dump              idem, but in a format suitable for later input\n"
-"  -i, --increment         number cylinders etc. from 1 instead of from 0\n"
-"  -u, --unit=[SBCM]       units in sectors, blocks, cylinders or MB\n"
-"  -1, --one-only          reserved option that does nothing currently\n"
-"  -T, --list-types        list the known partition types\n"
-"  -D, --DOS               for DOS-compatibility: waste a little space\n"
-"  -E, --DOS-extended      DOS extended partition compatibility\n"
-"  -R, --re-read           make kernel reread partition table\n"
-"  -N=NUM                  change only the partition with number NUM\n"
-"  -n                      do not actually write to disk\n"
-"  -O FILE                 save the sectors that will be overwritten to file\n"
-"  -I FILE                 restore sectors from file\n"
-"  -V, --verify            check that listed partition is reasonable\n"
-"  -v, --version           print version\n"
-"  -h, --help              print this message\n"
-msgstr ""
-
-#: fdisk/sfdisk.c:2379
-#, c-format
+msgstr ""
+"\n"
+"選項：\n"
+
+#: fdisk/sfdisk.c:2335
+msgid ""
+" -s, --show-size           list size of a partition\n"
+" -c, --id                  change or print partition Id\n"
+"     --change-id           change Id\n"
+"     --print-id            print Id\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2339
+msgid ""
+" -l, --list                list partitions of each device\n"
+" -d, --dump                idem, but in a format suitable for later input\n"
+" -i, --increment           number cylinders etc. from 1 instead of from 0\n"
+" -u, --unit <letter>       units to be used; <letter> can be one of\n"
+"                             S (sectors), C (cylinders), B (blocks), or M "
+"(MB)\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2344
+msgid ""
+" -1, --one-only            reserved option that does nothing currently\n"
+" -T, --list-types          list the known partition types\n"
+" -D, --DOS                 for DOS-compatibility: waste a little space\n"
+" -E, --DOS-extended        DOS extended partition compatibility\n"
+" -R, --re-read             make the kernel reread the partition table\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2349
+msgid ""
+" -N <number>               change only the partition with this <number>\n"
+" -n                        do not actually write to disk\n"
+" -O <file>                 save the sectors that will be overwritten to "
+"<file>\n"
+" -I <file>                 restore sectors from <file>\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2353
+msgid ""
+" -V, --verify              check that the listed partitions are reasonable\n"
+" -v, --version             display version information and exit\n"
+" -h, --help                display this help text and exit\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2357
+#, fuzzy
 msgid ""
 "\n"
 "Dangerous options:\n"
-"  -f, --force             disable all consistency checking\n"
-"  -g, --show-geometry     print the kernel's idea of the geometry\n"
-"  -A, --activate[=device] activate bootable flag\n"
-"  -G, --show-pt-geometry  print geometry guessed from the partition table\n"
-"  -U, --unhide[=device]   set partition unhidden\n"
-"      --no-reread         skip partition re-read at boot\n"
-"  -x, --show-extended     also list extended partitions on output\n"
-"                          or expect descriptors for them on input\n"
-"      --leave-last        do not allocate the last cylinder\n"
-"      --IBM               same as --leave-last\n"
-"      --in-order          partitions are in order\n"
-"      --not-in-order      partitions are not in order\n"
-"      --inside-order      all logicals inside outermost extended\n"
-"      --not-inside-order  not all logicals inside outermost extended\n"
-"      --nested            every partition is disjoint from all others\n"
-"      --chained           like nested, but extended partitions may lie "
+msgstr "危險選項："
+
+#: fdisk/sfdisk.c:2358
+msgid ""
+" -f, --force               disable all consistency checking\n"
+"     --no-reread           do not check whether the partition is in use\n"
+" -q, --quiet               suppress warning messages\n"
+" -L, --Linux               do not complain about things irrelevant for "
+"Linux\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2362
+#, fuzzy
+msgid ""
+" -g, --show-geometry       print the kernel's idea of the geometry\n"
+" -G, --show-pt-geometry    print geometry guessed from the partition table\n"
+msgstr "    -G [或 --show-pt-geometry]：印出根據分割表所猜測的硬碟結構參數"
+
+#: fdisk/sfdisk.c:2364
+#, fuzzy
+msgid ""
+" -A, --activate[=<device>] activate bootable flag\n"
+" -U, --unhide[=<dev>]      set partition unhidden\n"
+" -x, --show-extended       also list extended partitions in the output,\n"
+"                             or expect descriptors for them in the input\n"
+msgstr ""
+"    -x [或 --show-extended]：於輸出時也列出擴充分割區\n"
+"                            或預期輸入時有對於它們的描述"
+
+#: fdisk/sfdisk.c:2368
+msgid ""
+"     --leave-last          do not allocate the last cylinder\n"
+"     --IBM                 same as --leave-last\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2370
+msgid ""
+"     --in-order            partitions are in order\n"
+"     --not-in-order        partitions are not in order\n"
+"     --inside-outer        all logicals inside outermost extended\n"
+"     --not-inside-outer    not all logicals inside outermost extended\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2374
+msgid ""
+"     --nested              every partition is disjoint from all others\n"
+"     --chained             like nested, but extended partitions may lie "
 "outside\n"
-"      --onesector         partitions are mutually disjoint\n"
-"  -L, --Linux             do not complain about things irrelevant for Linux\n"
-"  -q, --quiet             suppress warning messages\n"
+"     --onesector           partitions are mutually disjoint\n"
+msgstr ""
+
+#: fdisk/sfdisk.c:2378
+msgid ""
 "\n"
-"  Override the detected geometry using:\n"
-"  -C, --cylinders=NUM     set the number of cylinders to use\n"
-"  -H, --heads=NUM         set the number of heads to use\n"
-"  -S, --sectors=NUM       set the number of sectors to use\n"
+"Override the detected geometry using:\n"
+" -C, --cylinders <number>  set the number of cylinders to use\n"
+" -H, --heads <number>      set the number of heads to use\n"
+" -S, --sectors <number>    set the number of sectors to use\n"
 "\n"
 msgstr ""
 
-#: fdisk/sfdisk.c:2409
+#: fdisk/sfdisk.c:2388
 msgid "Usage:"
 msgstr "用法："
 
-#: fdisk/sfdisk.c:2410
+#: fdisk/sfdisk.c:2389
 #, c-format
 msgid "%s device\t\t list active partitions on device\n"
 msgstr "%s 裝置\t\t 列出裝置上的作用中分割區\n"
 
-#: fdisk/sfdisk.c:2412
+#: fdisk/sfdisk.c:2390
 #, c-format
 msgid "%s device n1 n2 ... activate partitions n1 ..., inactivate the rest\n"
 msgstr "%s 裝置 n1 n2…啟用分割區 n1..., 停用其餘的\n"
 
-#: fdisk/sfdisk.c:2415
+#: fdisk/sfdisk.c:2392
 #, c-format
 msgid "%s -An device\t activate partition n, inactivate the other ones\n"
 msgstr "%s -An 裝置\t 啟用分割區 n, 停用另外一個\n"
 
-#: fdisk/sfdisk.c:2544
+#: fdisk/sfdisk.c:2521
 #, c-format
 msgid ""
 "\n"
@@ -5732,62 +5809,62 @@ msgstr ""
 "Parted。\n"
 "\n"
 
-#: fdisk/sfdisk.c:2549
+#: fdisk/sfdisk.c:2526
 #, c-format
 msgid "Use the --force flag to overrule this check.\n"
 msgstr "使用 --force 旗標以駁回這個檢查。\n"
 
-#: fdisk/sfdisk.c:2588
+#: fdisk/sfdisk.c:2565
 msgid "no command?\n"
 msgstr "沒有命令？\n"
 
-#: fdisk/sfdisk.c:2758
+#: fdisk/sfdisk.c:2735
 #, c-format
 msgid "total: %llu blocks\n"
 msgstr "總計：%llu 區塊\n"
 
-#: fdisk/sfdisk.c:2801
+#: fdisk/sfdisk.c:2778
 msgid "usage: sfdisk --print-id device partition-number\n"
 msgstr "用法：sfdisk --print-id 裝置 分割區編號\n"
 
-#: fdisk/sfdisk.c:2803
+#: fdisk/sfdisk.c:2780
 msgid "usage: sfdisk --change-id device partition-number Id\n"
 msgstr "用法：sfdisk --change-id 裝置 分割區編號 識別號\n"
 
-#: fdisk/sfdisk.c:2805
+#: fdisk/sfdisk.c:2782
 msgid "usage: sfdisk --id device partition-number [Id]\n"
 msgstr "用法：sfdisk --id 裝置 分割區編號 [識別號]\n"
 
-#: fdisk/sfdisk.c:2812
+#: fdisk/sfdisk.c:2789
 msgid "can specify only one device (except with -l or -s)\n"
 msgstr "只可以指定一個裝置 (除了配合 -l 或 -s)\n"
 
-#: fdisk/sfdisk.c:2838
+#: fdisk/sfdisk.c:2815
 #, c-format
 msgid "cannot open %s read-write\n"
 msgstr "無法開啟 %s 的可讀可寫\n"
 
-#: fdisk/sfdisk.c:2840
+#: fdisk/sfdisk.c:2817
 #, c-format
 msgid "cannot open %s for reading\n"
 msgstr "無法開啟 %s 用於讀取\n"
 
-#: fdisk/sfdisk.c:2884 fdisk/sfdisk.c:2916
+#: fdisk/sfdisk.c:2861 fdisk/sfdisk.c:2893
 #, c-format
 msgid "%s: %ld cylinders, %ld heads, %ld sectors/track\n"
 msgstr "%s：%ld 磁柱，%ld 磁頭，%ld 磁區/磁軌\n"
 
-#: fdisk/sfdisk.c:2935
+#: fdisk/sfdisk.c:2912
 #, c-format
 msgid "Cannot get size of %s\n"
 msgstr "無法取得 %s 的大小\n"
 
-#: fdisk/sfdisk.c:3015
+#: fdisk/sfdisk.c:2992
 #, c-format
 msgid "bad active byte: 0x%x instead of 0x80\n"
 msgstr "不當的作用中位元組：0x%x 而非 0x80\n"
 
-#: fdisk/sfdisk.c:3034 fdisk/sfdisk.c:3092 fdisk/sfdisk.c:3125
+#: fdisk/sfdisk.c:3011 fdisk/sfdisk.c:3068 fdisk/sfdisk.c:3101
 msgid ""
 "Done\n"
 "\n"
@@ -5795,7 +5872,7 @@ msgstr ""
 "完成\n"
 "\n"
 
-#: fdisk/sfdisk.c:3044
+#: fdisk/sfdisk.c:3020
 #, c-format
 msgid ""
 "You have %d active primary partitions. This does not matter for LILO,\n"
@@ -5804,35 +5881,35 @@ msgstr ""
 "您有 %d 塊作用中的主要分割區。這個不會影響到 LILO，\n"
 "但是 DOS MBR 只能將具有一塊作用中分割區的磁碟開機。\n"
 
-#: fdisk/sfdisk.c:3061
+#: fdisk/sfdisk.c:3037
 #, c-format
 msgid "partition %s has id %x and is not hidden\n"
 msgstr "分割區 %s 具有識別號 %x 而且並未隱藏\n"
 
-#: fdisk/sfdisk.c:3121
+#: fdisk/sfdisk.c:3097
 #, c-format
 msgid "Bad Id %lx\n"
 msgstr "不當的識別號 %lx\n"
 
-#: fdisk/sfdisk.c:3138
+#: fdisk/sfdisk.c:3114
 msgid "This disk is currently in use.\n"
 msgstr "這個磁碟為目前在使用中。\n"
 
-#: fdisk/sfdisk.c:3159
+#: fdisk/sfdisk.c:3135
 #, c-format
 msgid "Fatal error: cannot find %s\n"
 msgstr "嚴重錯誤：找不到 %s\n"
 
-#: fdisk/sfdisk.c:3162
+#: fdisk/sfdisk.c:3138
 #, c-format
 msgid "Warning: %s is not a block device\n"
 msgstr "警告：%s 並非區塊裝置\n"
 
-#: fdisk/sfdisk.c:3168
+#: fdisk/sfdisk.c:3144
 msgid "Checking that no-one is using this disk right now ...\n"
 msgstr "檢查是否沒有人現在正使用這個磁碟…\n"
 
-#: fdisk/sfdisk.c:3171
+#: fdisk/sfdisk.c:3146
 msgid ""
 "\n"
 "This disk is currently in use - repartitioning is probably a bad idea.\n"
@@ -5844,30 +5921,30 @@ msgstr ""
 "卸載所有檔案系統，並關閉這個磁碟上的所有交換分割區。\n"
 "使用 --no-reread 旗標以抑制這個檢查。\n"
 
-#: fdisk/sfdisk.c:3175
+#: fdisk/sfdisk.c:3150
 msgid "Use the --force flag to overrule all checks.\n"
 msgstr "使用 --force 旗標以駁回所有檢查。\n"
 
-#: fdisk/sfdisk.c:3179
+#: fdisk/sfdisk.c:3154
 msgid "OK\n"
 msgstr "確定\n"
 
-#: fdisk/sfdisk.c:3188
+#: fdisk/sfdisk.c:3163
 #, c-format
 msgid "Old situation:\n"
 msgstr "舊的情況：\n"
 
-#: fdisk/sfdisk.c:3192
+#: fdisk/sfdisk.c:3167
 #, c-format
 msgid "Partition %d does not exist, cannot change it\n"
 msgstr "分割區 %d 不存在，無法變更它\n"
 
-#: fdisk/sfdisk.c:3200
+#: fdisk/sfdisk.c:3175
 #, c-format
 msgid "New situation:\n"
 msgstr "新的情況：\n"
 
-#: fdisk/sfdisk.c:3205
+#: fdisk/sfdisk.c:3180
 msgid ""
 "I don't like these partitions - nothing changed.\n"
 "(If you really want this, use the --force option.)\n"
@@ -5875,21 +5952,21 @@ msgstr ""
 "我不喜歡這些分割 - 沒有變更任何東西。\n"
 "(如果您真的想要如此，請使用 --force 選項。)\n"
 
-#: fdisk/sfdisk.c:3209
+#: fdisk/sfdisk.c:3183
 msgid "I don't like this - probably you should answer No\n"
 msgstr "我不喜歡這個 - 您也許應該回答 No\n"
 
-#: fdisk/sfdisk.c:3214
+#: fdisk/sfdisk.c:3188
 #, c-format
 msgid "Are you satisfied with this? [ynq] "
 msgstr "您滿意這個嗎？[ynq] "
 
-#: fdisk/sfdisk.c:3216
+#: fdisk/sfdisk.c:3190
 #, c-format
 msgid "Do you want to write this to disk? [ynq] "
 msgstr "您要將這個寫入磁碟嗎？[ynq] "
 
-#: fdisk/sfdisk.c:3221
+#: fdisk/sfdisk.c:3195
 #, c-format
 msgid ""
 "\n"
@@ -5898,16 +5975,16 @@ msgstr ""
 "\n"
 "sfdisk：未達結尾的輸入\n"
 
-#: fdisk/sfdisk.c:3223
+#: fdisk/sfdisk.c:3197
 msgid "Quitting - nothing changed\n"
 msgstr "離開中 - 沒有變更任何東西\n"
 
-#: fdisk/sfdisk.c:3229
+#: fdisk/sfdisk.c:3203
 #, c-format
 msgid "Please answer one of y,n,q\n"
 msgstr "請以 y,n,q 之一回答\n"
 
-#: fdisk/sfdisk.c:3237
+#: fdisk/sfdisk.c:3211
 #, c-format
 msgid ""
 "Successfully wrote the new partition table\n"
@@ -5916,7 +5993,7 @@ msgstr ""
 "成功寫入新的分割表\n"
 "\n"
 
-#: fdisk/sfdisk.c:3245
+#: fdisk/sfdisk.c:3218
 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"
@@ -5947,26 +6024,28 @@ msgstr "同步磁碟。\n"
 msgid "(waiting) "
 msgstr ""
 
-#: fsck/fsck.c:294
-msgid "success"
-msgstr ""
+#. TRANSLATORS: These are followups to "Locking disk...".
+#: fsck/fsck.c:295
+#, fuzzy
+msgid "succeeded"
+msgstr "%s 成功。\n"
 
-#: fsck/fsck.c:294
+#: fsck/fsck.c:295
 #, fuzzy
 msgid "failed"
 msgstr "%s 失敗。\n"
 
-#: fsck/fsck.c:423
+#: fsck/fsck.c:424
 #, fuzzy, c-format
 msgid "WARNING: couldn't open %s"
 msgstr "警告：無法開啟 %s：%s\n"
 
-#: fsck/fsck.c:432
+#: fsck/fsck.c:433
 #, fuzzy, c-format
 msgid "WARNING: bad format on line %d of %s"
 msgstr "警告：不當的格式於 %2$s 的第 %1$d 列\n"
 
-#: fsck/fsck.c:448
+#: fsck/fsck.c:449
 #, fuzzy
 msgid ""
 "WARNING: Your /etc/fstab does not contain the fsck passno\n"
@@ -5978,37 +6057,37 @@ msgstr ""
 "\t應該儘快修正您的 /etc/fstab 檔案。\n"
 "\n"
 
-#: fsck/fsck.c:553
+#: fsck/fsck.c:554
 #, fuzzy, c-format
 msgid "%s: not found"
 msgstr "fsck：%s：找不到\n"
 
-#: fsck/fsck.c:673
+#: fsck/fsck.c:674
 #, fuzzy
 msgid "wait: no more child process?!?"
 msgstr "%s：等待：沒有更多子進程 ?!?\n"
 
-#: fsck/fsck.c:694
+#: fsck/fsck.c:695
 #, fuzzy, c-format
 msgid "Warning... %s for device %s exited with signal %d."
 msgstr "警告…%s 用於裝置 %s 已用信號 %d 離開。\n"
 
-#: fsck/fsck.c:700
+#: fsck/fsck.c:701
 #, fuzzy, c-format
 msgid "%s %s: status is %x, should never happen."
 msgstr "%s %s：狀態是 %x，應該永遠不會發生。\n"
 
-#: fsck/fsck.c:739
+#: fsck/fsck.c:740
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr "以 %s 完成 (離開狀態 %d)\n"
 
-#: fsck/fsck.c:799
+#: fsck/fsck.c:800
 #, fuzzy, c-format
 msgid "error %d while executing fsck.%s for %s"
 msgstr "%s：錯誤 %d 當執行 fsck.%s 用於 %s\n"
 
-#: fsck/fsck.c:870
+#: fsck/fsck.c:871
 #, fuzzy
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
@@ -6017,39 +6096,39 @@ msgstr ""
 "當檔案系統類型傳遞給 -t 時必須全部或是沒有任何一項\n"
 "加上前綴「no」或「!」。\n"
 
-#: fsck/fsck.c:971
+#: fsck/fsck.c:972
 #, fuzzy, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number"
 msgstr "%s：跳過 /etc/fstab 中不當的列：以非零值 fsck 通過數字連結掛載\n"
 
-#: fsck/fsck.c:983
+#: fsck/fsck.c:984
 #, c-format
 msgid "%s: skipping nonexistent device\n"
 msgstr "%s：跳過不存在的裝置\n"
 
-#: fsck/fsck.c:988
+#: fsck/fsck.c:989
 #, c-format
 msgid ""
 "%s: nonexistent device (\"nofail\" fstab option may be used to skip this "
 "device)\n"
 msgstr ""
 
-#: fsck/fsck.c:1015
+#: fsck/fsck.c:1016
 #, fuzzy, c-format
 msgid "cannot check %s: fsck.%s not found"
 msgstr "fsck：無法檢查 %s：找不到 fsck.%s\n"
 
-#: fsck/fsck.c:1101
+#: fsck/fsck.c:1102
 msgid "Checking all file systems.\n"
 msgstr "檢查所有檔案系統。\n"
 
-#: fsck/fsck.c:1192
+#: fsck/fsck.c:1193
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr "--等待-- (通過 %d)\n"
 
-#: fsck/fsck.c:1212
+#: fsck/fsck.c:1213
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6057,58 +6136,58 @@ msgid ""
 " %s [fsck-options] [fs-options] [filesys ...]\n"
 msgstr "用法：%s [選項] 裝置…\n"
 
-#: fsck/fsck.c:1216
+#: fsck/fsck.c:1217
 msgid ""
 "\n"
 "Options:\n"
-"  -A         check all file systems\n"
-"  -R         skip root, useful only with -A\n"
-"  -M         do not check mounted filesystems\n"
-"  -t [type]  specity file system types to be checked\n"
-"             type is allowed to be comma-separated list\n"
-"  -P         check file systems in parallel, including root\n"
-"  -s         serialize fsck operations\n"
-"  -l         use flock to lock device\n"
-"  -N         do not execute, just show what would be done\n"
-"  -T         do not show the title on startup\n"
-"  -C [fd]    display progress bar, file descriptor is for GUIs\n"
-"  -V         explain what is being done\n"
-"  -?         display this help and exit\n"
+" -A         check all filesystems\n"
+" -R         skip root filesystem; useful only with `-A'\n"
+" -M         do not check mounted filesystems\n"
+" -t <type>  specify filesystem types to be checked;\n"
+"              type is allowed to be comma-separated list\n"
+" -P         check filesystems in parallel, including root\n"
+" -s         serialize fsck operations\n"
+" -l         lock the device using flock()\n"
+" -N         do not execute, just show what would be done\n"
+" -T         do not show the title on startup\n"
+" -C <fd>    display progress bar; file descriptor is for GUIs\n"
+" -V         explain what is being done\n"
+" -?         display this help and exit\n"
 "\n"
 "See fsck.* commands for fs-options."
 msgstr ""
 
-#: fsck/fsck.c:1267
+#: fsck/fsck.c:1268
 #, fuzzy
 msgid "too many devices"
 msgstr "%s：太多裝置\n"
 
-#: fsck/fsck.c:1275
+#: fsck/fsck.c:1276
 #, fuzzy, c-format
 msgid "couldn't open %s"
 msgstr "無法開啟 %s\n"
 
-#: fsck/fsck.c:1277
+#: fsck/fsck.c:1278
 #, fuzzy
 msgid "Is /proc mounted?"
 msgstr "/proc 已經掛載？\n"
 
-#: fsck/fsck.c:1285
+#: fsck/fsck.c:1286
 #, fuzzy, c-format
 msgid "must be root to scan for matching filesystems: %s"
 msgstr "必須是 root 才能掃描符合的檔案系統：%s\n"
 
-#: fsck/fsck.c:1289
+#: fsck/fsck.c:1290
 #, fuzzy, c-format
 msgid "couldn't find matching filesystem: %s"
 msgstr "找不到符合的檔案系統：%s\n"
 
-#: fsck/fsck.c:1297 fsck/fsck.c:1382
+#: fsck/fsck.c:1298 fsck/fsck.c:1383
 #, fuzzy
 msgid "too many arguments"
 msgstr "%s：太多引數\n"
 
-#: fsck/fsck.c:1435
+#: fsck/fsck.c:1436
 msgid "the -l option can be used with one device only -- ignore"
 msgstr ""
 
@@ -6127,33 +6206,76 @@ msgstr "-l 或 --long 引數之後出現空的長選項"
 msgid "unknown shell after -s or --shell argument"
 msgstr "-s 或 --shell 引數之後出現不明的命令殼名稱"
 
-#: getopt/getopt.c:314
-#, c-format
+#: getopt/getopt.c:317
+#, fuzzy, c-format
 msgid ""
-"Usage: %1$s optstring parameters\n"
-"       %1$s [options] [--] optstring parameters\n"
-"       %1$s [options] -o|--options optstring [options] [--] parameters\n"
-"\n"
-"Options:\n"
-"  -a, --alternative            Allow long options starting with single -\n"
-"  -h, --help                   This small usage guide\n"
-"  -l, --longoptions=longopts   Long options to be recognized\n"
-"  -n, --name=progname          The name under which errors are reported\n"
-"  -o, --options=optstring      Short options to be recognized\n"
-"  -q, --quiet                  Disable error reporting by getopt(3)\n"
-"  -Q, --quiet-output           No normal output\n"
-"  -s, --shell=shell            Set shell quoting conventions\n"
-"  -T, --test                   Test for getopt(1) version\n"
-"  -u, --unquote                Do not quote the output\n"
-"  -V, --version                Output version information\n"
-"\n"
-msgstr ""
+" %1$s optstring parameters\n"
+" %1$s [options] [--] optstring parameters\n"
+" %1$s [options] -o|--options optstring [options] [--] parameters\n"
+msgstr "       getopt [選項] -o|--options 選項字串 [選項] [--]\n"
+
+#: getopt/getopt.c:323
+#, fuzzy
+msgid ""
+" -a, --alternative            Allow long options starting with single -\n"
+msgstr "  -a, --alternative            允許長選項以單一 - 開始\n"
+
+#: getopt/getopt.c:324
+#, fuzzy
+msgid " -h, --help                   This small usage guide\n"
+msgstr "  -h, --help                   這份簡單用法說明\n"
+
+#: getopt/getopt.c:325
+#, fuzzy
+msgid " -l, --longoptions <longopts> Long options to be recognized\n"
+msgstr "  -l, --longoptions=長選項     做為辨識的長選項\n"
+
+#: getopt/getopt.c:326
+#, fuzzy
+msgid ""
+" -n, --name <progname>        The name under which errors are reported\n"
+msgstr "  -n, --name=程式名稱          錯誤報告時所用的名稱\n"
+
+#: getopt/getopt.c:327
+#, fuzzy
+msgid " -o, --options <optstring>    Short options to be recognized\n"
+msgstr "  -o, --options=選項字串       做為辨識的短選項\n"
+
+#: getopt/getopt.c:328
+#, fuzzy
+msgid " -q, --quiet                  Disable error reporting by getopt(3)\n"
+msgstr "  -q, --quiet                  停用 getopt(3) 發出的錯誤報告\n"
+
+#: getopt/getopt.c:329
+#, fuzzy
+msgid " -Q, --quiet-output           No normal output\n"
+msgstr "  -Q, --quiet-output           沒有一般的輸出\n"
 
-#: getopt/getopt.c:377 getopt/getopt.c:438
+#: getopt/getopt.c:330
+#, fuzzy
+msgid " -s, --shell <shell>          Set shell quoting conventions\n"
+msgstr "  -s, --shell=命令殼            設定命令殼引號慣例\n"
+
+#: getopt/getopt.c:331
+#, fuzzy
+msgid " -T, --test                   Test for getopt(1) version\n"
+msgstr "  -T, --test                   測試 getopt(1) 的版本\n"
+
+#: getopt/getopt.c:332
+#, fuzzy
+msgid " -u, --unquote                Do not quote the output\n"
+msgstr "  -u, --unqote                 輸出不加上引號\n"
+
+#: getopt/getopt.c:333
+#, fuzzy
+msgid " -V, --version                Output version information\n"
+msgstr "  -V, --version                輸出版本資訊\n"
+
+#: getopt/getopt.c:382 getopt/getopt.c:443
 msgid "missing optstring argument"
 msgstr "缺少選項字串引數"
 
-#: getopt/getopt.c:433
+#: getopt/getopt.c:438
 msgid "internal error, contact the author."
 msgstr "內部錯誤，請與作者連絡。"
 
@@ -6595,91 +6717,109 @@ msgid "Unable to set the epoch value in the kernel.\n"
 msgstr "無法在內核中設定時期值。\n"
 
 #: hwclock/hwclock.c:1375
-#, c-format
+msgid " hwclock [function] [option...]\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1377
+#, fuzzy
 msgid ""
-"hwclock - query and set the hardware clock (RTC)\n"
-"\n"
-"Usage: hwclock [function] [options...]\n"
 "\n"
 "Functions:\n"
-"  -h | --help         show this help\n"
-"  -r | --show         read hardware clock and print result\n"
-"       --set          set the rtc to the time given with --date\n"
-"  -s | --hctosys      set the system time from the hardware clock\n"
-"  -w | --systohc      set the hardware clock to the current system time\n"
-"       --systz        set the system time based on the current timezone\n"
-"       --adjust       adjust the rtc to account for systematic drift since\n"
-"                      the clock was last set or adjusted\n"
+msgstr ""
+"\n"
+"選項：\n"
+
+#: hwclock/hwclock.c:1378
+msgid ""
+" -h, --help           show this help text and exit\n"
+" -r, --show           read hardware clock and print result\n"
+"     --set            set the RTC to the time given with --date\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1381
+msgid ""
+" -s, --hctosys        set the system time from the hardware clock\n"
+" -w, --systohc        set the hardware clock from the current system time\n"
+"     --systz          set the system time based on the current timezone\n"
+"     --adjust         adjust the RTC to account for systematic drift since\n"
+"                        the clock was last set or adjusted\n"
 msgstr ""
 
 #: hwclock/hwclock.c:1387
-#, c-format
 msgid ""
-"       --getepoch     print out the kernel's hardware clock epoch value\n"
-"       --setepoch     set the kernel's hardware clock epoch value to the \n"
-"                      value given with --epoch\n"
+"     --getepoch       print out the kernel's hardware clock epoch value\n"
+"     --setepoch       set the kernel's hardware clock epoch value to the \n"
+"                        value given with --epoch\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1392
-#, c-format
+#: hwclock/hwclock.c:1391
 msgid ""
-"       --predict      predict rtc reading at time given with --date\n"
-"  -v | --version      print out the version of hwclock to stdout\n"
-"\n"
-"Options: \n"
-"  -u | --utc          the hardware clock is kept in UTC\n"
-"       --localtime    the hardware clock is kept in local time\n"
+"     --predict        predict RTC reading at time given with --date\n"
+" -V, --version        display version information and exit\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1399
+#: hwclock/hwclock.c:1395
+msgid ""
+" -u, --utc            the hardware clock is kept in UTC\n"
+"     --localtime      the hardware clock is kept in local time\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1398
+msgid " -f, --rtc <file>     special /dev/... file to use instead of default\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1401
 #, c-format
-msgid "  -f | --rtc=path     special /dev/... file to use instead of default\n"
+msgid ""
+"     --directisa      access the ISA bus directly instead of %s\n"
+"     --badyear        ignore RTC's year because the BIOS is broken\n"
+"     --date <time>    specifies the time to which to set the hardware clock\n"
+"     --epoch <year>   specifies the year which is the beginning of the\n"
+"                        hardware clock's epoch value\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1402
+#: hwclock/hwclock.c:1407
 #, c-format
 msgid ""
-"       --directisa    access the ISA bus directly instead of %s\n"
-"       --badyear      ignore rtc's year because the bios is broken\n"
-"       --date         specifies the time to which to set the hardware clock\n"
-"       --epoch=year   specifies the year which is the beginning of the \n"
-"                      hardware clock's epoch value\n"
-"       --noadjfile    do not access %s. Requires the use of\n"
-"                      either --utc or --localtime\n"
-"       --adjfile=path specifies the path to the adjust file (default is\n"
-"                      %s)\n"
-"       --test         do everything except actually updating the hardware\n"
-"                      clock or anything else\n"
-"  -D | --debug        debug mode\n"
+"     --noadjfile      do not access %s; this requires the use of\n"
+"                        either --utc or --localtime\n"
+"     --adjfile <file> specifies the path to the adjust file;\n"
+"                        the default is %s\n"
+msgstr ""
+
+#: hwclock/hwclock.c:1411
+msgid ""
+"     --test           do not update anything, just show what would happen\n"
+" -D, --debug          debugging mode\n"
 "\n"
 msgstr ""
 
-#: hwclock/hwclock.c:1417
-#, c-format
+#: hwclock/hwclock.c:1414
+#, fuzzy
 msgid ""
-"  -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
-"       tell hwclock the type of alpha you have (see hwclock(8))\n"
+" -J|--jensen, -A|--arc, -S|--srm, -F|--funky-toy\n"
+"      tell hwclock the type of Alpha you have (see hwclock(8))\n"
 "\n"
 msgstr ""
 "  -J|--jensen，-A|--arc，-S|--srm，-F|--funky-toy\n"
 "               告訴 hwclock 您所具有的 alpha 類型 (參看 hwclock (8))\n"
 
-#: hwclock/hwclock.c:1514
+#: hwclock/hwclock.c:1511
 #, fuzzy
 msgid "Unable to connect to audit system"
 msgstr "%s：無法與稽核系統連接\n"
 
-#: hwclock/hwclock.c:1605
+#: hwclock/hwclock.c:1602
 #, fuzzy
 msgid "failed to parse epoch"
 msgstr "剖析 pid 時失敗"
 
-#: hwclock/hwclock.c:1644
+#: hwclock/hwclock.c:1641
 #, c-format
 msgid "%s takes no non-option arguments.  You supplied %d.\n"
 msgstr "%s 無需非選項引數。 您卻已給定 %d。\n"
 
-#: hwclock/hwclock.c:1651
+#: hwclock/hwclock.c:1648
 #, fuzzy
 msgid ""
 "You have specified multiple functions.\n"
@@ -6688,59 +6828,59 @@ msgstr ""
 "您已指定多重功能。\n"
 "您只能一次實行一個功能。\n"
 
-#: hwclock/hwclock.c:1657
+#: hwclock/hwclock.c:1654
 #, fuzzy
 msgid ""
 "The --utc and --localtime options are mutually exclusive.  You specified "
 "both."
 msgstr "%s：--utc 和 --localtime 選項互斥。 您卻已指定兩者。\n"
 
-#: hwclock/hwclock.c:1663
+#: hwclock/hwclock.c:1660
 #, fuzzy
 msgid ""
 "The --adjust and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr "%s：--adjust 和 --noadjfile 選項互斥。 您卻已指定兩者。\n"
 
-#: hwclock/hwclock.c:1669
+#: hwclock/hwclock.c:1666
 #, fuzzy
 msgid ""
 "The --adjfile and --noadjfile options are mutually exclusive.  You specified "
 "both."
 msgstr "%s：--adjust 和 --noadjfile 選項互斥。 您卻已指定兩者。\n"
 
-#: hwclock/hwclock.c:1677
+#: hwclock/hwclock.c:1674
 #, fuzzy
 msgid "With --noadjfile, you must specify either --utc or --localtime"
 msgstr "%s：配合 --noadjfile 使用，您必須指定 --utc 或 --localtime 兩者之一\n"
 
-#: hwclock/hwclock.c:1690
+#: hwclock/hwclock.c:1687
 #, fuzzy
 msgid "No usable set-to time.  Cannot set clock."
 msgstr "無可用的 set-to 時間。 無法設定時鐘。\n"
 
-#: hwclock/hwclock.c:1705
+#: hwclock/hwclock.c:1702
 #, fuzzy
 msgid "Sorry, only the superuser can change the Hardware Clock."
 msgstr "抱歉，只有系統管理者可以變更硬體時鐘。\n"
 
-#: hwclock/hwclock.c:1709
+#: hwclock/hwclock.c:1706
 #, fuzzy
 msgid "Sorry, only the superuser can change the System Clock."
 msgstr "抱歉，只有系統管理者可以變更系統時鐘。\n"
 
-#: hwclock/hwclock.c:1713
+#: hwclock/hwclock.c:1710
 #, fuzzy
 msgid ""
 "Sorry, only the superuser can change the Hardware Clock epoch in the kernel."
 msgstr "抱歉，只有系統管理者可以變更內核中的硬體時鐘時期。\n"
 
-#: hwclock/hwclock.c:1736
+#: hwclock/hwclock.c:1733
 #, fuzzy
 msgid "Cannot access the Hardware Clock via any known method."
 msgstr "無法透過任何已知方法去存取硬體時鐘。\n"
 
-#: hwclock/hwclock.c:1739
+#: hwclock/hwclock.c:1736
 #, fuzzy
 msgid ""
 "Use the --debug option to see the details of our search for an access method."
@@ -6917,7 +7057,7 @@ msgid "failed to read mtab"
 msgstr "讀取時失敗：%s"
 
 #: libmount/samples/mount.c:113 libmount/samples/mount.c:158
-#: misc-utils/findmnt.c:603 misc-utils/findmnt.c:669
+#: misc-utils/findmnt.c:605 misc-utils/findmnt.c:671
 msgid "failed to initialize libmount iterator"
 msgstr "初始化 libmount 迭代器時失敗"
 
@@ -6964,45 +7104,85 @@ msgid ""
 "\n"
 "Options:\n"
 " -a, --all               mount all filesystems mentioned in fstab\n"
-" -f, --fake              dry run, skip mount(2) syscall\n"
+" -c, --no-canonicalize   don't canonicalize paths\n"
+" -f, --fake              dry run; skip the mount(2) syscall\n"
 " -F, --fork              fork off for each device (use with -a)\n"
-" -h, --help              this help\n"
+msgstr ""
+
+#: libmount/samples/mount.c:209
+#, c-format
+msgid ""
+" -h, --help              display this help text and exit\n"
+" -i, --internal-only     don't call the mount.<type> helpers\n"
+" -l, --show-labels       lists all mounts with LABELs\n"
 " -n, --no-mtab           don't write to /etc/mtab\n"
+msgstr ""
+
+#: libmount/samples/mount.c:214
+#, c-format
+msgid ""
+" -o, --options <list>    comma-separated list of mount options\n"
+" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
 " -r, --read-only         mount the filesystem read-only (same as -o ro)\n"
-" -v, --verbose           verbose mode\n"
-" -V, --version           print version string\n"
+" -t, --types <list>      limit the set of filesystem types\n"
+msgstr ""
+
+#: libmount/samples/mount.c:219
+#, c-format
+msgid ""
+" -v, --verbose           say what is being done\n"
+" -V, --version           display version information and exit\n"
 " -w, --read-write        mount the filesystem read-write (default)\n"
-" -o, --options <list>    comma separated string of mount options\n"
-" -O, --test-opts <list>  limit the set of filesystems (use with -a)\n"
-" -t, --types <list>      indicate the filesystem type\n"
-" -c, --no-canonicalize   don't canonicalize paths\n"
-" -i, --internal-only     don't call the mount.<type> helpers\n"
-" -l, --show-labels       lists all mounts with LABELs\n"
+msgstr ""
+
+#: libmount/samples/mount.c:224
+#, c-format
+msgid ""
 "\n"
 "Source:\n"
 " -L, --label <label>     synonym for LABEL=<label>\n"
 " -U, --uuid <uuid>       synonym for UUID=<uuid>\n"
 " LABEL=<label>           specifies device by filesystem label\n"
 " UUID=<uuid>             specifies device by filesystem UUID\n"
+msgstr ""
+
+#: libmount/samples/mount.c:230
+#, c-format
+msgid ""
 " <device>                specifies device by path\n"
 " <directory>             mountpoint for bind mounts (see --bind/rbind)\n"
 " <file>                  regular file for loopdev setup\n"
+msgstr ""
+
+#: libmount/samples/mount.c:235
+#, c-format
+msgid ""
 "\n"
 "Operations:\n"
 " -B, --bind              mount a subtree somewhere else (same as -o bind)\n"
 " -M, --move              move a subtree to some other place\n"
 " -R, --rbind             mount a subtree and all submounts somewhere else\n"
+msgstr ""
+
+#: libmount/samples/mount.c:240
+#, c-format
+msgid ""
 " --make-shared           mark a subtree as shared\n"
 " --make-slave            mark a subtree as slave\n"
 " --make-private          mark a subtree as private\n"
 " --make-unbindable       mark a subtree as unbindable\n"
+msgstr ""
+
+#: libmount/samples/mount.c:245
+#, c-format
+msgid ""
 " --make-rshared          recursively mark a whole subtree as shared\n"
 " --make-rslave           recursively mark a whole subtree as slave\n"
 " --make-rprivate         recursively mark a whole subtree as private\n"
 " --make-runbindable      recursively mark a whole subtree as unbindable\n"
 msgstr ""
 
-#: libmount/samples/mount.c:243
+#: libmount/samples/mount.c:250
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -7012,27 +7192,27 @@ msgstr ""
 "要獲得更多資訊請參看 ipcmk(1)。\n"
 "\n"
 
-#: libmount/samples/mount.c:297
+#: libmount/samples/mount.c:304
 #, fuzzy
 msgid "libmount context allocation failed"
 msgstr "mount：掛載時失敗"
 
-#: libmount/samples/mount.c:332 libmount/samples/mount.c:342
-#: libmount/samples/mount.c:346
+#: libmount/samples/mount.c:339 libmount/samples/mount.c:349
+#: libmount/samples/mount.c:353
 #, fuzzy
 msgid "failed to append options"
 msgstr "剖析 pid 時失敗"
 
-#: libmount/samples/mount.c:350
+#: libmount/samples/mount.c:357
 #, fuzzy
 msgid "failed to set options pattern"
 msgstr "取得 pid %d 的屬性時失敗"
 
-#: libmount/samples/mount.c:355
+#: libmount/samples/mount.c:362
 msgid "only one <source> may be specified"
 msgstr ""
 
-#: libmount/samples/mount.c:358
+#: libmount/samples/mount.c:365
 #, fuzzy
 msgid "failed to allocate source buffer"
 msgstr "配置輸出緩衝區時失敗"
@@ -7119,7 +7299,7 @@ msgid "%s: PAM failure, aborting: %s"
 msgstr "%s：PAM 失敗，放棄：%s\n"
 
 #: login-utils/chfn.c:212 login-utils/chsh.c:204 login-utils/login.c:835
-#: login-utils/newgrp.c:82 mount/lomount.c:862 mount/lomount.c:865
+#: login-utils/newgrp.c:82 mount/lomount.c:863 mount/lomount.c:866
 msgid "Password: "
 msgstr "密碼："
 
@@ -7562,47 +7742,48 @@ msgstr "EXCESSIVE 換列字元"
 msgid "too many bare linefeeds."
 msgstr "太多單純換列字元。\n"
 
-#: login-utils/login.c:1359
+#. TRANSLATORS: The standard value for %d is 60.
+#: login-utils/login.c:1360
 #, fuzzy, c-format
 msgid "timed out after %d seconds"
 msgstr "%d 秒之後登入將逾時\n"
 
-#: login-utils/login.c:1453
+#: login-utils/login.c:1454
 #, c-format
 msgid "Last login: %.*s "
 msgstr "上次登入：%.*s "
 
-#: login-utils/login.c:1457
+#: login-utils/login.c:1458
 #, c-format
 msgid "from %.*s\n"
 msgstr "從 %.*s\n"
 
-#: login-utils/login.c:1460
+#: login-utils/login.c:1461
 #, c-format
 msgid "on %.*s\n"
 msgstr "於 %.*s\n"
 
-#: login-utils/login.c:1478
+#: login-utils/login.c:1479
 #, fuzzy
 msgid "write lastlog failed"
 msgstr "寫入標準輸出時失敗"
 
-#: login-utils/login.c:1487
+#: login-utils/login.c:1488
 #, c-format
 msgid "LOGIN FAILURE FROM %s, %s"
 msgstr "從 %s, %s 的登入失敗"
 
-#: login-utils/login.c:1490
+#: login-utils/login.c:1491
 #, c-format
 msgid "LOGIN FAILURE ON %s, %s"
 msgstr "於 %s, %s 的登入失敗"
 
-#: login-utils/login.c:1494
+#: login-utils/login.c:1495
 #, c-format
 msgid "%d LOGIN FAILURES FROM %s, %s"
 msgstr "%d 從 %s, %s 的登入失敗"
 
-#: login-utils/login.c:1497
+#: login-utils/login.c:1498
 #, c-format
 msgid "%d LOGIN FAILURES ON %s, %s"
 msgstr "%d 於 %s, %s 的登入失敗"
@@ -7632,7 +7813,7 @@ msgstr "mount：權限被拒"
 msgid "setuid failed"
 msgstr "setuid() 失敗"
 
-#: login-utils/newgrp.c:130 sys-utils/unshare.c:126
+#: login-utils/newgrp.c:130 sys-utils/unshare.c:127
 #, c-format
 msgid "exec %s failed"
 msgstr "執行 %s 時失敗"
@@ -7677,8 +7858,8 @@ msgstr "%s：無法設定 %s 的上下關係"
 msgid "%s: can't unlock %s: %s (your changes are still in %s)\n"
 msgstr "%s：無法解除鎖定 %s: %s (您的變更是仍然在 %s 中)\n"
 
-#: login-utils/vipw.c:241 mount/swapon.c:252 term-utils/script.c:265
-#: term-utils/script.c:275
+#: login-utils/vipw.c:241 mount/swapon.c:263 term-utils/script.c:264
+#: term-utils/script.c:274
 msgid "fork failed"
 msgstr "衍生執行時失敗"
 
@@ -7730,24 +7911,21 @@ msgstr "不合法的年份：使用 1-9999"
 msgid "%s %d"
 msgstr "%s %d"
 
-#: misc-utils/cal.c:786
+#: misc-utils/cal.c:788
 #, fuzzy, c-format
-msgid "Usage: %s [options] [[[day] month] year]\n"
+msgid " %s [options] [[[day] month] year]\n"
 msgstr "用法：cal [-13smjyV] [[[日] 月] 年]\n"
 
-#: misc-utils/cal.c:789
-#, c-format
+#: misc-utils/cal.c:792
 msgid ""
-"\n"
-"Options:\n"
-" -1, --one        single month\n"
-" -3, --three      previous, current and next month\n"
-" -s, --sunday     sunday as first day\n"
-" -m, --monday     monday as fistt day\n"
-" -j, --julian     julian dates\n"
-" -y, --year       current year\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
+" -1, --one        show only current month (default)\n"
+" -3, --three      show previous, current and next month\n"
+" -s, --sunday     Sunday as first day of week\n"
+" -m, --monday     Monday as first day of week\n"
+" -j, --julian     output Julian dates\n"
+" -y, --year       show whole current year\n"
+" -V, --version    display version information and exit\n"
+" -h, --help       display this help text and exit\n"
 "\n"
 msgstr ""
 
@@ -7858,32 +8036,32 @@ msgstr " 移除"
 msgid "failed to add line to output"
 msgstr "加入輸出列時失敗"
 
-#: misc-utils/findmnt.c:486
+#: misc-utils/findmnt.c:487
 #, fuzzy, c-format
 msgid "%s: parse error at line %d"
 msgstr "剖析錯誤發生於列號："
 
-#: misc-utils/findmnt.c:497 misc-utils/findmnt.c:663
+#: misc-utils/findmnt.c:498 misc-utils/findmnt.c:665
 #, fuzzy
 msgid "failed to initialize libmount table"
 msgstr "初始化 libmount 頁標時失敗"
 
-#: misc-utils/findmnt.c:512 text-utils/parse.c:64
+#: misc-utils/findmnt.c:513 text-utils/parse.c:64
 #, fuzzy, c-format
 msgid "can't read %s"
 msgstr "無法讀取：%s"
 
-#: misc-utils/findmnt.c:675
+#: misc-utils/findmnt.c:677
 #, fuzzy
 msgid "failed to initialize libmount tabdiff"
 msgstr "初始化 libmount 頁標時失敗"
 
-#: misc-utils/findmnt.c:703
+#: misc-utils/findmnt.c:705
 #, fuzzy
 msgid "poll() failed"
 msgstr "malloc() 失敗"
 
-#: misc-utils/findmnt.c:762
+#: misc-utils/findmnt.c:764
 #, c-format
 msgid ""
 "\n"
@@ -7900,73 +8078,74 @@ msgstr ""
 " %1$s [選項] <裝置> <掛載點>\n"
 " %1$s [選項] [--source <裝置>] [--target <掛載點>]\n"
 
-#: misc-utils/findmnt.c:770
-#, fuzzy, c-format
+#: misc-utils/findmnt.c:772
+#, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -s, --fstab            search in static table of filesystems\n"
 " -m, --mtab             search in table of mounted filesystems\n"
-" -k, --kernel           search in kernel table of mounted \n"
-"                        filesystems (default)\n"
+" -k, --kernel           search in kernel table of mounted\n"
+"                          filesystems (default)\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:779
+#, c-format
+msgid ""
 " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
-" -w, --timeout <num>    upper limit in millisecods which --poll will block\n"
+" -w, --timeout <num>    upper limit in milliseconds that --poll will block\n"
 "\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:783
+#, c-format
+msgid ""
+" -a, --ascii            use ASCII chars for tree formatting\n"
 " -c, --canonicalize     canonicalize printed paths\n"
-" -d, --direction <word> search direction - 'forward' or 'backward'\n"
-" -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+" -d, --direction <word> direction of search, 'forward' or 'backward'\n"
+" -e, --evaluate         convert tags (LABEL/UUID) to device names\n"
 " -f, --first-only       print the first found filesystem only\n"
-" -h, --help             print this help\n"
-" -i, --invert           invert sense of matching\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:790
+#, c-format
+msgid ""
+" -h, --help             display this help text and exit\n"
+" -i, --invert           invert the sense of matching\n"
 " -l, --list             use list format output\n"
-" -n, --noheadings       don't print headings\n"
+" -n, --noheadings       don't print column headings\n"
 " -u, --notruncate       don't truncate text in columns\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:796
+#, c-format
+msgid ""
 " -O, --options <list>   limit the set of filesystems by mount options\n"
-" -o, --output <list>    output columns\n"
+" -o, --output <list>    the output columns to be shown\n"
 " -P, --pairs            use key=\"value\" output format\n"
 " -r, --raw              use raw output format\n"
-" -a, --ascii            use ascii chars for tree formatting\n"
-" -t, --types <list>     limit the set of filesystem by FS types\n"
+" -t, --types <list>     limit the set of filesystems by FS types\n"
+msgstr ""
+
+#: misc-utils/findmnt.c:802
+#, c-format
+msgid ""
 " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
-" -R, --submounts        print all submount for the matching filesystems\n"
-" -S, --source <string>  device, LABEL= or UUID=device\n"
-" -T, --target <string>  mountpoint\n"
+" -R, --submounts        print all submounts for the matching filesystems\n"
+" -S, --source <string>  the device to mount (by name, LABEL= or UUID=)\n"
+" -T, --target <string>  the mountpoint to use\n"
 "\n"
 msgstr ""
-"\n"
-"選項：\n"
-" -s, --fstab            在檔案系統的靜態表格中搜尋\n"
-" -m, --mtab             在掛載檔案系統的表格中搜尋\n"
-" -k, --kernel           在掛載檔案系統的內核表格中\n"
-"                        搜尋 (預設)\n"
-"\n"
-" -c, --canonicalize     正則化印出路徑\n"
-" -d, --direction <word> 搜尋方向 - 'forward' 或 'backward'\n"
-" -e, --evaluate         印出所有已求值標記 (LABEL/UUID)\n"
-" -f, --first-only       只印出第一個找到的檔案系統\n"
-" -h, --help             印出這個說明\n"
-" -i, --invert           反向符合方式\n"
-" -l, --list             使用清單格式輸出\n"
-" -n, --noheadings       不列印標頭\n"
-" -u, --notruncate       不截斷直欄中的文字\n"
-" -O, --options <list>   依掛載選項限制檔案系統集合\n"
-" -o, --output <list>    輸出直欄\n"
-" -r, --raw              使用原始格式輸出\n"
-" -a, --ascii            使用 ascii 字元於樹狀格式化\n"
-" -t, --types <list>     依檔案系統類型限制檔案系統集合\n"
-" -S, --source <string>  裝置、LABEL= 或 UUID=裝置\n"
-" -T, --target <string>  掛載點\n"
-"\n"
 
-#: misc-utils/findmnt.c:800 misc-utils/lsblk.c:892
+#: misc-utils/findmnt.c:808 misc-utils/lsblk.c:893
 #, fuzzy, c-format
 msgid ""
 "\n"
 "Available columns:\n"
 msgstr "可用命令：\n"
 
-#: misc-utils/findmnt.c:806
+#: misc-utils/findmnt.c:814
 #, c-format
 msgid ""
 "\n"
@@ -7975,40 +8154,40 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 findmnt(1)。\n"
 
-#: misc-utils/findmnt.c:814 misc-utils/lsblk.c:905
+#: misc-utils/findmnt.c:822 misc-utils/lsblk.c:906
 msgid "options are mutually exclusive"
 msgstr "選項彼此互斥"
 
-#: misc-utils/findmnt.c:882
+#: misc-utils/findmnt.c:890
 #, c-format
 msgid "unknown direction '%s'"
 msgstr "不明方向「%s」"
 
-#: misc-utils/findmnt.c:973
+#: misc-utils/findmnt.c:981
 #, fuzzy
 msgid "failed to parse timeout"
 msgstr "剖析 pid 時失敗"
 
-#: misc-utils/findmnt.c:1003
+#: misc-utils/findmnt.c:1011
 msgid ""
 "options --target and --source can't be used together with command line "
 "element that is not an option"
 msgstr "選項 --target 和 --source 無法與不是選項的命令列元素一起使用"
 
-#: misc-utils/findmnt.c:1042
+#: misc-utils/findmnt.c:1050
 msgid "failed to initialize libmount cache"
 msgstr "初始化 libmount 快取時失敗"
 
-#: misc-utils/findmnt.c:1052 misc-utils/lsblk.c:1038 partx/partx.c:470
+#: misc-utils/findmnt.c:1060 misc-utils/lsblk.c:1039 partx/partx.c:470
 msgid "failed to initialize output table"
 msgstr "初始化輸出表格時失敗"
 
-#: misc-utils/findmnt.c:1064
+#: misc-utils/findmnt.c:1072
 #, c-format
 msgid "%s column is requested, but --poll is not enabled"
 msgstr ""
 
-#: misc-utils/findmnt.c:1070 misc-utils/lsblk.c:1048 partx/partx.c:478
+#: misc-utils/findmnt.c:1078 misc-utils/lsblk.c:1049 partx/partx.c:478
 msgid "failed to initialize output column"
 msgstr "初始化輸出欄時失敗"
 
@@ -8032,12 +8211,12 @@ msgstr "%s：找不到進程「%s」\n"
 msgid "%s: unknown signal %s; valid signals:\n"
 msgstr "%s：不明信號 %s; 有效信號：\n"
 
-#: misc-utils/kill.c:416
+#: misc-utils/kill.c:415
 #, c-format
 msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
 msgstr "用法：%s [-s signal | -p ] [ -a ] pid…\n"
 
-#: misc-utils/kill.c:417
+#: misc-utils/kill.c:416
 #, c-format
 msgid "       %s -l [ signal ]\n"
 msgstr "       %s -l [ signal ]\n"
@@ -8057,85 +8236,84 @@ msgstr "通訊端：%s。\n"
 msgid "connect %s"
 msgstr "連接：%s。\n"
 
-#: misc-utils/logger.c:97 misc-utils/uuidd.c:139
+#: misc-utils/logger.c:97 misc-utils/uuidd.c:140
 msgid "socket"
 msgstr "通訊端"
 
-#: misc-utils/logger.c:104 misc-utils/uuidd.c:150
+#: misc-utils/logger.c:104 misc-utils/uuidd.c:151
 msgid "connect"
 msgstr "連接"
 
-#: misc-utils/logger.c:139
+#: misc-utils/logger.c:140
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] message\n"
+msgid " %s [options] [message]\n"
 msgstr ""
 "\n"
 "用法：%s [選項]\n"
 "\n"
 
-#: misc-utils/logger.c:144
-#, c-format
+#: misc-utils/logger.c:143
 msgid ""
-"\n"
-"Options:\n"
-" -i, --id            log process id\n"
-" -s, --stderr        log message to standard error as well\n"
-" -f, --file FILE     log contents of the specified file\n"
-" -p, --priority PRI  enter message priority\n"
-" -t, --tag TAG       mark every line with tag\n"
-" -u, --socket SOCK   write to socket\n"
-" -d, --udp           use udp (tcp is default)\n"
-" -n, --server ADDR   write to remote syslog server\n"
-" -P, --port          define port number\n"
-" -V, --version       output version information and exit\n"
-" -h, --help          display this help and exit\n"
+" -d, --udp             use UDP (TCP is default)\n"
+" -i, --id              log the process ID too\n"
+" -f, --file <file>     log the contents of this file\n"
+" -h, --help            display this help text and exit\n"
+msgstr ""
+
+#: misc-utils/logger.c:147
+msgid ""
+" -n, --server <name>   write to this remote syslog server\n"
+" -P, --port <number>   use this UDP port\n"
+" -p, --priority <prio> mark given message with this priority\n"
+" -s, --stderr          output message to standard error as well\n"
+msgstr ""
+
+#: misc-utils/logger.c:151
+msgid ""
+" -t, --tag <tag>       mark every line with this tag\n"
+" -u, --socket <socket> write to this Unix socket\n"
+" -V, --version         output version information and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/logger.c:202
+#: misc-utils/logger.c:200
 #, fuzzy, c-format
 msgid "file %s"
 msgstr "(下一個檔案：%s)"
 
-#: misc-utils/logger.c:229
+#: misc-utils/logger.c:227
 #, fuzzy
 msgid "failed to parse port number"
 msgstr "剖析優先權時失敗"
 
-#: misc-utils/logger.c:231
+#: misc-utils/logger.c:229
 #, fuzzy, c-format
 msgid "port `%ld' out of range"
 msgstr "數值超出範圍。\n"
 
-#: misc-utils/logger.c:330
+#: misc-utils/logger.c:328
 #, fuzzy, c-format
 msgid "unknown facility name: %s."
 msgstr "logger：不明功能名稱：%s。\n"
 
-#: misc-utils/logger.c:340
+#: misc-utils/logger.c:338
 #, fuzzy, c-format
 msgid "unknown priority name: %s."
 msgstr "logger：不明的優先名稱：%s。\n"
 
-#: misc-utils/look.c:366
+#: misc-utils/look.c:368
 #, fuzzy, c-format
-msgid "Usage: %s [options] string [file]\n"
+msgid " %s [options] string [file]\n"
 msgstr "用法：%s [選項] 裝置…\n"
 
-#: misc-utils/look.c:369
-#, c-format
+#: misc-utils/look.c:371
 msgid ""
-"\n"
-"Options:\n"
-" -a, --alternative  use alternate dictionary\n"
-" -d, --alphanum     compare only alpha numeric characters\n"
-" -f, --ignore-case  ignore when comparing\n"
-" -t, --terminate=C  define string termination character\n"
-" -V, --version      output version information and exit\n"
-" -h, --help         display this help and exit\n"
+" -a, --alternative      use alternate dictionary\n"
+" -d, --alphanum         compare only alpha numeric characters\n"
+" -f, --ignore-case      ignore when comparing\n"
+" -t, --terminate <char> define string termination character\n"
+" -V, --version          output version information and exit\n"
+" -h, --help             display this help and exit\n"
 "\n"
 msgstr ""
 
@@ -8275,7 +8453,7 @@ msgstr ""
 
 #: misc-utils/lsblk.c:792
 #, fuzzy, c-format
-msgid "%s: failed to get whole-list devno"
+msgid "%s: failed to get whole-disk device number"
 msgstr "%s：無法尋指到交換標籤 "
 
 #: misc-utils/lsblk.c:809
@@ -8293,12 +8471,13 @@ msgstr "%s：無法開啟"
 msgid "failed to parse list '%s'"
 msgstr "剖析 %s %s 時失敗"
 
-#: misc-utils/lsblk.c:859
+#. TRANSLATORS: The standard value for %d is 256.
+#: misc-utils/lsblk.c:860
 #, c-format
 msgid "the list of excluded devices is too large (limit is %d devices)"
 msgstr ""
 
-#: misc-utils/lsblk.c:871
+#: misc-utils/lsblk.c:872
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8306,7 +8485,7 @@ msgid ""
 " %s [options] [<device> ...]\n"
 msgstr "用法：%s [選項] 裝置…\n"
 
-#: misc-utils/lsblk.c:875
+#: misc-utils/lsblk.c:876
 #, c-format
 msgid ""
 "\n"
@@ -8329,7 +8508,7 @@ msgid ""
 " -t, --topology       output info about topology\n"
 msgstr ""
 
-#: misc-utils/lsblk.c:897
+#: misc-utils/lsblk.c:898
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -8338,33 +8517,33 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 swaplabel(8)。\n"
 
-#: misc-utils/mcookie.c:66 misc-utils/uuidd.c:54 misc-utils/uuidgen.c:33
+#: misc-utils/mcookie.c:68 misc-utils/uuidd.c:56 misc-utils/uuidgen.c:35
+#: sys-utils/dmesg.c:134 sys-utils/ipcmk.c:88 sys-utils/lscpu.c:1038
+#: sys-utils/rtcwake.c:88 term-utils/setterm.c:677
 #, fuzzy, c-format
-msgid "Usage: %s [options]\n"
+msgid " %s [options]\n"
 msgstr "用法：%s [選項]\n"
 
-#: misc-utils/mcookie.c:69
-#, c-format
+#: misc-utils/mcookie.c:71
 msgid ""
+" -f, --file <file> use file as a cookie seed\n"
+" -v, --verbose     explain what is being done\n"
+" -V, --version     output version information and exit\n"
+" -h, --help        display this help and exit\n"
 "\n"
-"Options:\n"
-" -f, --file=FILE  use file as a cookie seed\n"
-" -v, --verbose    explain what is being done\n"
-" -V, --version    output version information and exit\n"
-" -h, --help       display this help and exit\n"
 msgstr ""
 
-#: misc-utils/mcookie.c:143 misc-utils/mcookie.c:177
+#: misc-utils/mcookie.c:144 misc-utils/mcookie.c:178
 #, fuzzy, c-format
 msgid "Could not open %s"
 msgstr "無法開啟 %s\n"
 
-#: misc-utils/mcookie.c:148 misc-utils/mcookie.c:172
+#: misc-utils/mcookie.c:149 misc-utils/mcookie.c:173
 #, c-format
 msgid "Got %d bytes from %s\n"
 msgstr "從 %2$s 取得 %1$d 位元組\n"
 
-#: misc-utils/mcookie.c:154
+#: misc-utils/mcookie.c:155
 #, fuzzy, c-format
 msgid "closing %s failed"
 msgstr "執行 %s 時失敗"
@@ -8384,26 +8563,15 @@ msgstr "無法顯示狀態「%s」"
 msgid "%s - No such file or directory\n"
 msgstr "%s：需要檔案描述符號、檔案或目錄\n"
 
-#: misc-utils/namei.c:411
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options] pathname [pathname ...]\n"
+#: misc-utils/namei.c:413
+#, fuzzy, c-format
+msgid " %s [options] pathname [pathname ...]\n"
 msgstr ""
 "\n"
 "用法：%s [選項] 路徑名稱 [路徑名稱...]\n"
 
-#: misc-utils/namei.c:412 text-utils/column.c:91
-#, c-format
-msgid ""
-"\n"
-"Options:\n"
-msgstr ""
-"\n"
-"選項：\n"
-
-#: misc-utils/namei.c:415
-#, fuzzy, c-format
+#: misc-utils/namei.c:416
+#, fuzzy
 msgid ""
 " -h, --help          displays this help text\n"
 " -V, --version       output version information and exit\n"
@@ -8422,8 +8590,7 @@ msgstr ""
 " -n, --nosymlinks    不跟隨符號連結\n"
 " -v, --vertical      垂直對齊模式和擁有者\n"
 
-#: misc-utils/namei.c:424
-#, c-format
+#: misc-utils/namei.c:425
 msgid ""
 "\n"
 "For more information see namei(1).\n"
@@ -8431,12 +8598,12 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 namei(1)。\n"
 
-#: misc-utils/namei.c:484
+#: misc-utils/namei.c:485
 #, fuzzy
 msgid "pathname argument is missing"
 msgstr "--date 引數太長\n"
 
-#: misc-utils/namei.c:508
+#: misc-utils/namei.c:509
 #, c-format
 msgid "%s: exceeded limit of symlinks"
 msgstr "%s：超出符號連結的限制"
@@ -8446,166 +8613,161 @@ msgstr "%s：超出符號連結的限制"
 msgid "renaming %s to %s failed"
 msgstr "%s：重新命名 %s 為 %s 時失敗：%s\n"
 
-#: misc-utils/rename.c:65
+#: misc-utils/rename.c:66
 #, fuzzy, c-format
-msgid "Usage: %s [options] expression replacement file...\n"
+msgid " %s [options] expression replacement file...\n"
 msgstr "用法：%s [選項] 裝置…\n"
 
-#: misc-utils/rename.c:68
-#, c-format
+#: misc-utils/rename.c:70
 msgid ""
-"\n"
-"Options:\n"
 " -v, --verbose    explain what is being done\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:57
-#, c-format
+#: misc-utils/uuidd.c:59
 msgid ""
-"\n"
-"Options:\n"
-" -p, --pid=PATH      path to pid file\n"
-" -s, --socket=PATH   path to socket\n"
-" -T, --timeout=SEC   specify inactivity timeout\n"
+" -p, --pid <path>    path to pid file\n"
+" -s, --socket <path> path to socket\n"
+" -T, --timeout <sec> specify inactivity timeout\n"
 " -k, --kill          kill running daemon\n"
 " -r, --random        test random-based generation\n"
 " -t, --time          test time-based generation\n"
-" -n, --uuids=NUM     request number of uuids\n"
+" -n, --uuids <num>   request number of uuids\n"
 " -d, --debug         run in debugging mode\n"
 " -q, --quiet         turn on quiet mode\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
+"\n"
 msgstr ""
 
-#: misc-utils/uuidd.c:132
+#: misc-utils/uuidd.c:133
 msgid "bad arguments"
 msgstr "不當的引數"
 
-#: misc-utils/uuidd.c:170
+#: misc-utils/uuidd.c:171
 msgid "write"
 msgstr "寫入"
 
-#: misc-utils/uuidd.c:178
+#: misc-utils/uuidd.c:179
 msgid "read count"
 msgstr "讀取計數"
 
-#: misc-utils/uuidd.c:184
+#: misc-utils/uuidd.c:185
 msgid "bad response length"
 msgstr "不當的回應長度"
 
-#: misc-utils/uuidd.c:225
+#: misc-utils/uuidd.c:226
 #, c-format
 msgid "Failed to open/create %s: %s\n"
 msgstr "開啟/建立 %s 時失敗：%s\n"
 
-#: misc-utils/uuidd.c:242
+#: misc-utils/uuidd.c:243
 #, c-format
 msgid "Failed to lock %s: %s\n"
 msgstr "鎖定 %s 時失敗：%s\n"
 
-#: misc-utils/uuidd.c:249
+#: misc-utils/uuidd.c:250
 #, c-format
 msgid "uuidd daemon already running at pid %s\n"
 msgstr "uuidd 守護程式已經以 pid %s 運行中\n"
 
-#: misc-utils/uuidd.c:257
+#: misc-utils/uuidd.c:258
 #, c-format
 msgid "Couldn't create unix stream socket: %s"
 msgstr "無法建立 unix 串流通訊端：%s"
 
-#: misc-utils/uuidd.c:284
+#: misc-utils/uuidd.c:285
 #, c-format
 msgid "Couldn't bind unix socket %s: %s\n"
 msgstr "無法連結 unix 通訊端 %s：%s\n"
 
-#: misc-utils/uuidd.c:292
+#: misc-utils/uuidd.c:293
 #, c-format
 msgid "Couldn't listen on unix socket %s: %s\n"
 msgstr "無法監聽 unix 通訊端 %s：%s\n"
 
-#: misc-utils/uuidd.c:332
+#: misc-utils/uuidd.c:333
 #, c-format
 msgid "Error reading from client, len = %d\n"
 msgstr "從客戶端讀取時發生錯誤，長度 = %d\n"
 
-#: misc-utils/uuidd.c:341
+#: misc-utils/uuidd.c:342
 #, c-format
 msgid "operation %d, incoming num = %d\n"
 msgstr "操作 %d，即將來到的數字 = %d\n"
 
-#: misc-utils/uuidd.c:344
+#: misc-utils/uuidd.c:345
 #, c-format
 msgid "operation %d\n"
 msgstr "操作 %d\n"
 
-#: misc-utils/uuidd.c:360
+#: misc-utils/uuidd.c:361
 #, c-format
 msgid "Generated time UUID: %s\n"
 msgstr "產生的時間 UUID：%s\n"
 
-#: misc-utils/uuidd.c:370
+#: misc-utils/uuidd.c:371
 #, c-format
 msgid "Generated random UUID: %s\n"
 msgstr "產生的隨機 UUID：%s\n"
 
-#: misc-utils/uuidd.c:379
-#, c-format
+#: misc-utils/uuidd.c:380
+#, fuzzy, c-format
 msgid "Generated time UUID %s and %d following\n"
-msgstr "產生的時間 UUID %s 和 %d 是依照\n"
+msgid_plural "Generated time UUID %s and %d following\n"
+msgstr[0] "產生的時間 UUID %s 和 %d 是依照\n"
 
-#: misc-utils/uuidd.c:397
-#, c-format
-msgid "Generated %d UUIDs:\n"
-msgstr "產生 %d UUIDs：\n"
+#: misc-utils/uuidd.c:401
+#, fuzzy, c-format
+msgid "Generated %d UUID:\n"
+msgid_plural "Generated %d UUIDs:\n"
+msgstr[0] "產生 %d UUIDs：\n"
 
-#: misc-utils/uuidd.c:410
+#: misc-utils/uuidd.c:415
 #, c-format
 msgid "Invalid operation %d\n"
 msgstr "無效的操作 %d\n"
 
-#: misc-utils/uuidd.c:422
+#: misc-utils/uuidd.c:427
 #, fuzzy, c-format
 msgid "Unexpected reply length from server %d"
 msgstr "未預期從伺服器 %d 的回覆長度\n"
 
-#: misc-utils/uuidd.c:473 misc-utils/uuidd.c:498
+#: misc-utils/uuidd.c:478 misc-utils/uuidd.c:503
 #, c-format
 msgid "Bad number: %s\n"
 msgstr "不當的數字：%s\n"
 
-#: misc-utils/uuidd.c:536 misc-utils/uuidd.c:563
+#: misc-utils/uuidd.c:541 misc-utils/uuidd.c:570
 #, c-format
 msgid "Error calling uuidd daemon (%s): %s\n"
 msgstr "呼叫 uuidd 守護程式 (%s) 時發生錯誤：%s\n"
 
-#: misc-utils/uuidd.c:546
-#, c-format
-msgid "%s and subsequent %d UUIDs\n"
-msgstr "%s 和後續的 %d UUIDs\n"
+#: misc-utils/uuidd.c:551
+#, fuzzy, c-format
+msgid "%s and %d subsequent UUID\n"
+msgid_plural "%s and %d subsequent UUIDs\n"
+msgstr[0] "%s 和後續的 %d UUIDs\n"
 
-#: misc-utils/uuidd.c:548
+#: misc-utils/uuidd.c:555
 #, c-format
 msgid "List of UUIDs:\n"
 msgstr "UUIDs 列表：\n"
 
-#: misc-utils/uuidd.c:583
+#: misc-utils/uuidd.c:590
 #, c-format
 msgid "Couldn't kill uuidd running at pid %d: %s\n"
 msgstr "無法砍除執行於 pid %d 的 uuidd：%s\n"
 
-#: misc-utils/uuidd.c:589
+#: misc-utils/uuidd.c:596
 #, c-format
 msgid "Killed uuidd running at pid %d\n"
 msgstr "已砍除執行於 pid %d 的 uuidd\n"
 
-#: misc-utils/uuidgen.c:36
-#, c-format
+#: misc-utils/uuidgen.c:38
 msgid ""
-"\n"
-"Options:\n"
 " -r, --random     generate random-based uuid\n"
 " -t, --time       generate time-based uuid\n"
 " -V, --version    output version information and exit\n"
@@ -8613,29 +8775,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc-utils/whereis.c:132
+#: misc-utils/whereis.c:134
 #, fuzzy, c-format
-msgid "Usage: %s [options] file\n"
+msgid " %s [options] file\n"
 msgstr "用法：%s [選項] 裝置…\n"
 
-#: misc-utils/whereis.c:135
-#, c-format
+#: misc-utils/whereis.c:137
 msgid ""
-"\n"
-"Options:\n"
-" -f file    define search scope\n"
+" -f <file>  define search scope\n"
 " -b         search only binaries\n"
-" -B dirs    define binaries lookup path\n"
+" -B <dirs>  define binaries lookup path\n"
 " -m         search only manual paths\n"
-" -M dirs    define man lookup path\n"
+" -M <dirs>  define man lookup path\n"
 " -s         search only sources path\n"
-" -S dirs    define sources lookup path\n"
+" -S <dirs>  define sources lookup path\n"
 " -u         search from unusual enties\n"
 " -V         output version information and exit\n"
 " -h         display this help and exit\n"
 "\n"
-"See how to use file and dirs arguments from whereis(1) manual.\n"
-"\n"
+msgstr ""
+
+#: misc-utils/whereis.c:148
+msgid "See how to use file and dirs arguments from whereis(1) manual.\n"
 msgstr ""
 
 #: misc-utils/wipefs.c:132
@@ -8668,29 +8829,31 @@ msgid "%s: write failed"
 msgstr "%s：寫入失敗"
 
 #: misc-utils/wipefs.c:240
-#, c-format
-msgid "%zd bytes ["
-msgstr "%zd 位元組 ["
-
-#: misc-utils/wipefs.c:248
-#, c-format
-msgid "] erased at offset 0x%jx (%s)\n"
+#, fuzzy, c-format
+msgid ""
+"%zd bytes were erased at offset 0x%jx (%s)\n"
+"they were: "
 msgstr "] 已清除於偏移值 0x%jx (%s)\n"
 
-#: misc-utils/wipefs.c:294
+#: misc-utils/wipefs.c:295
 #, c-format
 msgid "invalid offset value '%s' specified"
 msgstr "指定了無效的偏移值「%s」"
 
-#: misc-utils/wipefs.c:306
+#: misc-utils/wipefs.c:305
 #, fuzzy, c-format
+msgid " %s [options] <device>\n"
+msgstr "用法：%s [選項] 裝置…\n"
+
+#: misc-utils/wipefs.c:308
+#, fuzzy
 msgid ""
 " -a, --all           wipe all magic strings (BE CAREFUL!)\n"
 " -h, --help          show this help text\n"
 " -n, --no-act        do everything except the actual write() call\n"
 " -o, --offset <num>  offset to erase, in bytes\n"
 " -p, --parsable      print out in parsable instead of printable format\n"
-" -v, --version       output version information and exit\n"
+" -V, --version       output version information and exit\n"
 msgstr ""
 " -a, --all           抹拭所有魔術字串 (請小心 !)\n"
 " -h, --help          顯示這個說明文字\n"
@@ -8698,7 +8861,7 @@ msgstr ""
 " -o, --offset <num>  要清除的偏移值，以位元組為單位\n"
 " -p, --parsable      以可剖析而非可列印的格式來印出\n"
 
-#: misc-utils/wipefs.c:313
+#: misc-utils/wipefs.c:315
 #, c-format
 msgid ""
 "\n"
@@ -8707,11 +8870,11 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 wipefs(8)。\n"
 
-#: misc-utils/wipefs.c:369
+#: misc-utils/wipefs.c:371
 msgid "--offset and --all are mutually exclusive"
 msgstr "--offset 和 --all 彼此互斥"
 
-#: misc-utils/wipefs.c:376
+#: misc-utils/wipefs.c:378
 msgid "only one device as argument is currently supported."
 msgstr ""
 
@@ -8803,63 +8966,63 @@ msgstr "變更 %s 的擁有者時發生錯誤：%s\n"
 msgid "can't rename %s to %s: %s\n"
 msgstr "無法重新命名 %s 為 %s: %s\n"
 
-#: mount/lomount.c:429 mount/lomount.c:567 mount/lomount.c:599
-#: mount/lomount.c:662 mount/lomount.c:707
+#: mount/lomount.c:430 mount/lomount.c:568 mount/lomount.c:600
+#: mount/lomount.c:663 mount/lomount.c:708
 #, c-format
 msgid "%s: /dev directory does not exist."
 msgstr "%s：/dev 目錄不存在。"
 
-#: mount/lomount.c:468
+#: mount/lomount.c:469
 #, c-format
 msgid "loop: can't set capacity on device %s: %s\n"
 msgstr "loop：無法設定裝置上的容量 %s：%s\n"
 
-#: mount/lomount.c:505
+#: mount/lomount.c:506
 #, c-format
 msgid ", offset %<PRIu64>"
 msgstr "，偏移值 %<PRIu64>"
 
-#: mount/lomount.c:508
+#: mount/lomount.c:509
 #, c-format
 msgid ", sizelimit %<PRIu64>"
 msgstr "，大小限制 %<PRIu64>"
 
-#: mount/lomount.c:516
+#: mount/lomount.c:517
 #, c-format
 msgid ", encryption %s (type %<PRIu32>)"
 msgstr "，加密 %s (類型 %<PRIu32>)"
 
-#: mount/lomount.c:529
+#: mount/lomount.c:530
 #, c-format
 msgid ", offset %d"
 msgstr "，偏移 %d"
 
-#: mount/lomount.c:532
+#: mount/lomount.c:533
 #, c-format
 msgid ", encryption type %d\n"
 msgstr "，加密類型 %d\n"
 
-#: mount/lomount.c:540
+#: mount/lomount.c:541
 #, c-format
 msgid "loop: can't get info on device %s: %s\n"
 msgstr "loop：無法取得裝置上的資訊 %s: %s\n"
 
-#: mount/lomount.c:551
+#: mount/lomount.c:552
 #, c-format
 msgid "loop: can't open device %s: %s\n"
 msgstr "loop：無法開啟裝置 %s: %s\n"
 
-#: mount/lomount.c:578 mount/lomount.c:720
+#: mount/lomount.c:579 mount/lomount.c:721
 #, c-format
 msgid "%s: no permission to look at /dev/loop%s<N>"
 msgstr "%s：無權限可查看 /dev/loop%s<N>"
 
-#: mount/lomount.c:723
+#: mount/lomount.c:724
 #, c-format
 msgid "%s: could not find any free loop device"
 msgstr "%s：找不到任何可用的環路裝置"
 
-#: mount/lomount.c:726
+#: mount/lomount.c:727
 #, c-format
 msgid ""
 "%s: Could not find any loop device. Maybe this kernel does not know\n"
@@ -8868,55 +9031,53 @@ msgstr ""
 "%s：找不到任何環路裝置。也許這個內核不認識\n"
 "      什麼是環路裝置？(如果是這樣，請重新編譯或執行「modprobe loop」。)"
 
-#: mount/lomount.c:756
+#: mount/lomount.c:757
 msgid "Out of memory while reading passphrase"
 msgstr "讀取密語時記憶體不足"
 
-#: mount/lomount.c:799
+#: mount/lomount.c:800
 #, c-format
 msgid "warning: %s is already associated with %s\n"
 msgstr "警告：%s 已經和 %s 相關聯\n"
 
-#: mount/lomount.c:815
+#: mount/lomount.c:816
 #, c-format
 msgid "warning: %s: is write-protected, using read-only.\n"
 msgstr "警告：%s：為防寫，使用唯讀。\n"
 
-#: mount/lomount.c:851
+#: mount/lomount.c:852
 #, c-format
 msgid "Couldn't lock into memory, exiting.\n"
 msgstr "無法鎖入記憶體，即將離開。\n"
 
-#: mount/lomount.c:878
+#: mount/lomount.c:879
 #, c-format
 msgid "ioctl LOOP_SET_FD failed: %s\n"
 msgstr "ioctl LOOP_SET_FD 失敗：%s\n"
 
-#: mount/lomount.c:935
+#: mount/lomount.c:936
 #, c-format
 msgid "set_loop(%s,%s,%llu,%llu): success\n"
 msgstr "set_loop(%s,%s,%llu,%llu)：成功\n"
 
-#: mount/lomount.c:956
+#: mount/lomount.c:957
 #, c-format
 msgid "del_loop(%s): success\n"
 msgstr "del_loop(%s)：成功\n"
 
-#: mount/lomount.c:960
+#: mount/lomount.c:961
 #, c-format
 msgid "loop: can't delete device %s: %s\n"
 msgstr "loop：無法刪除裝置 %s: %s\n"
 
-#: mount/lomount.c:971
+#: mount/lomount.c:972
 #, c-format
 msgid "This mount was compiled without loop support. Please recompile.\n"
 msgstr "這個 mount 程式編譯時不具環路支援。請重新編譯。\n"
 
-#: mount/lomount.c:1013
-#, c-format
+#: mount/lomount.c:1017
+#, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s loop_device                             give info\n"
 " %1$s -a | --all                              list all used\n"
 " %1$s -d | --detach <loopdev> [<loopdev> ...] delete\n"
@@ -8924,7 +9085,7 @@ msgid ""
 " %1$s -c | --set-capacity <loopdev>           resize\n"
 " %1$s -j | --associated <file> [-o <num>]     list all associated with "
 "<file>\n"
-" %1$s [ options ] {-f|--find|loopdev} <file>  setup\n"
+" %1$s [options] {-f|--find|loopdev} <file>    setup\n"
 msgstr ""
 "\n"
 "用法：\n"
@@ -8936,19 +9097,17 @@ msgstr ""
 " %1$s -j | --associated <file>[-o <num>]      列出所有與 <file> 相關聯的\n"
 " %1$s [選項] {-f|--find|loopdev} <file>       設定\n"
 
-#: mount/lomount.c:1023
-#, c-format
+#: mount/lomount.c:1027
+#, fuzzy
 msgid ""
-"\n"
-"Options:\n"
-" -e | --encryption <type> enable data encryption with specified <name/num>\n"
-" -h | --help              this help\n"
-" -o | --offset <num>      start at offset <num> into file\n"
-"      --sizelimit <num>   loop limited to only <num> bytes of the file\n"
-" -p | --pass-fd <num>     read passphrase from file descriptor <num>\n"
-" -r | --read-only         setup read-only loop device\n"
-"      --show              print device name (with -f <file>)\n"
-" -v | --verbose           verbose mode\n"
+" -e, --encryption <type> enable data encryption with specified <name/num>\n"
+" -h, --help              this help\n"
+" -o, --offset <num>      start at offset <num> into file\n"
+"     --sizelimit <num>   loop limited to only <num> bytes of the file\n"
+" -p, --pass-fd <num>     read passphrase from file descriptor <num>\n"
+" -r, --read-only         setup read-only loop device\n"
+"     --show              print device name (with -f <file>)\n"
+" -v, --verbose           verbose mode\n"
 "\n"
 msgstr ""
 "\n"
@@ -8963,32 +9122,32 @@ msgstr ""
 " -v | --verbose           詳細模式\n"
 "\n"
 
-#: mount/lomount.c:1149
+#: mount/lomount.c:1152
 #, c-format
 msgid "%s: invalid offset '%s' specified"
 msgstr "%s：指定了無效的偏移值「%s」"
 
-#: mount/lomount.c:1153
+#: mount/lomount.c:1156
 #, c-format
 msgid "%s: invalid sizelimit '%s' specified"
 msgstr "%s：指定了無效的大小限制「%s」"
 
-#: mount/lomount.c:1168 mount/lomount.c:1208
+#: mount/lomount.c:1171 mount/lomount.c:1211
 #, c-format
 msgid "Loop device is %s\n"
 msgstr "環路裝置是 %s\n"
 
-#: mount/lomount.c:1195
+#: mount/lomount.c:1198
 #, c-format
 msgid "stolen loop=%s...trying again\n"
 msgstr "丟失的環路=%s...再試一次\n"
 
-#: mount/lomount.c:1205
+#: mount/lomount.c:1208
 #, c-format
 msgid "%s: %s: device is busy"
 msgstr "%s：%s：裝置忙碌中"
 
-#: mount/lomount.c:1222
+#: mount/lomount.c:1225
 #, c-format
 msgid "No loop support was available at compile time. Please recompile.\n"
 msgstr "編譯時期就已不支援環路。請重新編譯。\n"
@@ -9561,14 +9720,17 @@ msgstr "在 xstrndup 呼叫中有程式錯誤"
 msgid "not enough memory"
 msgstr "記憶體不足"
 
-#: mount/swapon.c:94
-#, c-format
+#: mount/swapon.c:93
+#, fuzzy
 msgid ""
-"The <special> parameter:\n"
-" {-L label | LABEL=label}             LABEL of device to be used\n"
-" {-U uuid  | UUID=uuid}               UUID of device to be used\n"
-" <device>                             name of device to be used\n"
-" <file>                               name of file to be used\n"
+"\n"
+"The <spec> parameter:\n"
+" -L <label>             LABEL of device to be used\n"
+" -U <uuid>              UUID of device to be used\n"
+" LABEL=<label>          LABEL of device to be used\n"
+" UUID=<uuid>            UUID of device to be used\n"
+" <device>               name of device to be used\n"
+" <file>                 name of file to be used\n"
 "\n"
 msgstr ""
 "<special> 參數：\n"
@@ -9578,163 +9740,149 @@ msgstr ""
 " <file>                               要使用的檔案名稱\n"
 "\n"
 
-#: mount/swapon.c:102
+#: mount/swapon.c:104 mount/swapon.c:125
 #, fuzzy, c-format
+msgid " %s [options] [<spec>]\n"
+msgstr "用法：%s [選項] 裝置…\n"
+
+#: mount/swapon.c:107
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
-" %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
-" %1$s -s                            display swap usage summary\n"
-" %1$s -h                            display help\n"
-" %1$s -V                            display version\n"
-"\n"
+" -a, --all              enable all swaps from /etc/fstab\n"
+" -d, --discard          discard freed pages before they are reused\n"
+" -e, --ifexists         silently skip devices that do not exis\n"
+" -f, --fixpgsz          reinitialize the swap space if necessary\n"
+" -h, --help             display help and exit\n"
+" -p, --priority <prio>  specify the priority of the swap device.\n"
+" -s, --summary          display summary about used swap devices and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"用法：\n"
-" %1$s -a [-e] [-v] [-f]             從 /etc/fstab 啟用全部交換區\n"
-" %1$s [-p 優先權] [-v] [-f] <special> 啟用給定交換區\n"
-" %1$s -s                            顯示交換區用法概要\n"
-" %1$s -h                            顯示說明\n"
-" %1$s -V                            顯示版本\n"
-"\n"
 
-#: mount/swapon.c:116
-#, c-format
+#: mount/swapon.c:128
 msgid ""
-"\n"
-"Usage:\n"
-" %1$s -a [-v]                      disable all swaps\n"
-" %1$s [-v] <special>               disable given swap\n"
-" %1$s -h                           display help\n"
-" %1$s -V                           display version\n"
-"\n"
+" -a, --all              disable all swaps from /proc/swaps\n"
+" -h, --help             display help and exit\n"
+" -v, --verbose          verbose mode\n"
+" -V, --version          display version and exit\n"
 msgstr ""
-"\n"
-"用法：\n"
-" %1$s -a [-v]                      停用所有交換區\n"
-" %1$s [-v] <special>               停用給定的交換區\n"
-" %1$s -h                           顯示說明\n"
-" %1$s -V                           顯示版本\n"
-"\n"
 
-#: mount/swapon.c:151
+#: mount/swapon.c:162
 #, c-format
 msgid "%s: unexpected file format"
 msgstr "%s：未預期的檔案格式"
 
-#: mount/swapon.c:248
+#: mount/swapon.c:259
 #, c-format
 msgid "%s: reinitializing the swap."
 msgstr "%s：重新初始化交換區。"
 
-#: mount/swapon.c:268
+#: mount/swapon.c:279
 msgid "execv failed"
 msgstr "execv 失敗"
 
-#: mount/swapon.c:276
+#: mount/swapon.c:287
 msgid "waitpid failed"
 msgstr "waitpid 失敗"
 
-#: mount/swapon.c:300
+#: mount/swapon.c:311
 #, c-format
 msgid "%s: lseek failed"
 msgstr "%s：lseek 失敗"
 
-#: mount/swapon.c:306
+#: mount/swapon.c:317
 #, c-format
 msgid "%s: write signature failed"
 msgstr "%s：寫入簽章時失敗"
 
-#: mount/swapon.c:392
+#: mount/swapon.c:403
 #, c-format
 msgid "%s: found swap signature: version %d, page-size %d, %s byte order"
 msgstr "%s：找到交換區簽章：版本 %d，頁面大小 %d，%s 位元組序"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "different"
 msgstr "不同"
 
-#: mount/swapon.c:397
+#: mount/swapon.c:408
 msgid "same"
 msgstr "相同"
 
-#: mount/swapon.c:422
+#: mount/swapon.c:433
 #, c-format
 msgid "%s: insecure permissions %04o, %04o suggested."
 msgstr "%s：不安全的權限 %04o, 建議使用 %04o。"
 
-#: mount/swapon.c:427
+#: mount/swapon.c:438
 #, fuzzy, c-format
 msgid "%s: insecure file owner %d, 0 (root) suggested."
 msgstr "%s：不安全的權限 %04o, 建議使用 %04o。"
 
-#: mount/swapon.c:434
+#: mount/swapon.c:445
 #, c-format
 msgid "%s: skipping - it appears to have holes."
 msgstr "%s：跳過 - 看來似乎有漏洞。"
 
-#: mount/swapon.c:448
+#: mount/swapon.c:459
 #, c-format
 msgid "%s: get size failed"
 msgstr "%s：取得大小時失敗"
 
-#: mount/swapon.c:454
+#: mount/swapon.c:465
 #, c-format
 msgid "%s: read swap header failed"
 msgstr "%s：讀取交換區頁首失敗"
 
-#: mount/swapon.c:462
+#: mount/swapon.c:475
 #, c-format
 msgid "%s: pagesize=%d, swapsize=%llu, devsize=%llu"
 msgstr "%s：pagesize=%d，swapsize=%llu，devsize=%llu"
 
-#: mount/swapon.c:467
+#: mount/swapon.c:480
 #, c-format
 msgid "%s: last_page 0x%08llx is larger than actual size of swapspace"
 msgstr "%s：last_page 0x%08llx 大於實際的交換區空間大小"
 
-#: mount/swapon.c:472
+#: mount/swapon.c:485
 #, c-format
 msgid "%s: swap format pagesize does not match."
 msgstr "%s：交換區格式頁面大小不吻合。"
 
-#: mount/swapon.c:477
+#: mount/swapon.c:490
 #, c-format
 msgid ""
 "%s: swap format pagesize does not match. (Use --fixpgsz to reinitialize it.)"
 msgstr "%s：交換區格式頁面大小不吻合。(使用 --fixpgsz 以重新初始它。)"
 
-#: mount/swapon.c:486
+#: mount/swapon.c:499
 #, c-format
 msgid "%s: software suspend data detected. Rewriting the swap signature."
 msgstr "%s：偵測到軟體懸置資料。重新寫入交換區簽章。"
 
-#: mount/swapon.c:510 mount/swapon.c:565
+#: mount/swapon.c:523 mount/swapon.c:578
 #, c-format
 msgid "%s on %s\n"
 msgstr "%s 於 %s\n"
 
-#: mount/swapon.c:535
+#: mount/swapon.c:548
 #, c-format
 msgid "%s: swapon failed"
 msgstr "%s：swapon 失敗"
 
-#: mount/swapon.c:542
+#: mount/swapon.c:555
 #, c-format
 msgid "cannot find the device for %s"
 msgstr "找不到做為 %s 的裝置"
 
-#: mount/swapon.c:577
+#: mount/swapon.c:590
 msgid "Not superuser."
 msgstr "並非系統管理者。"
 
-#: mount/swapon.c:580
+#: mount/swapon.c:593
 #, c-format
 msgid "%s: swapoff failed"
 msgstr "%s：swapoff 失敗"
 
-#: mount/swapon.c:851
+#: mount/swapon.c:864
 #, c-format
 msgid "'%s' is unsupported program name (must be 'swapon' or 'swapoff')."
 msgstr "「%s」為不受支援的程式名稱 (必須是「swapon」或「swapoff」)。"
@@ -10010,7 +10158,7 @@ msgstr "已選分割區 %d\n"
 msgid "%s: error deleting partitions %d-%d"
 msgstr ""
 
-#: partx/partx.c:252 partx/partx.c:825
+#: partx/partx.c:252 partx/partx.c:828
 #, c-format
 msgid "specified range <%d:%d> does not make sense"
 msgstr ""
@@ -10070,19 +10218,13 @@ msgstr "        (偵測到 %s 分割表)。"
 msgid "%s: %s partition table does not contains usable partitions"
 msgstr "磁碟 %s 不包含有效的分割表\n"
 
-#: partx/partx.c:582
+#: partx/partx.c:583
 #, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [-a|-d|-s] [--nr <N:M> | <partition>] <disk>\n"
+msgid " %s [-a|-d|-s] [--nr <n:m> | <partition>] <disk>\n"
 msgstr ""
 
 #: partx/partx.c:587
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -a, --add            add specified partitions or all of them\n"
 " -d, --delete         delete specified partitions or all of them\n"
 " -l, --list           list partitions (DEPRECATED)\n"
@@ -10093,21 +10235,20 @@ msgid ""
 " -g, --noheadings     don't print headings for --show\n"
 " -P, --pairs          use key=\"value\" output format\n"
 " -r, --raw            use raw output format\n"
-" -t, --type <TYPE>    specify the partition type (dos, bsd, solaris, etc.)\n"
-" -n, --nr <M:N>       specify the range of partitions (e.g. --nr 2:4)\n"
-" -o, --output <LIST>  define which output columns to use\n"
+" -t, --type <type>    specify the partition type (dos, bsd, solaris, etc.)\n"
+" -n, --nr <n:m>       specify the range of partitions (e.g. --nr 2:4)\n"
+" -o, --output <type>  define which output columns to use\n"
 " -h, --help           print this help\n"
-"\n"
 msgstr ""
 
-#: partx/partx.c:602
-#, fuzzy, c-format
+#: partx/partx.c:601
+#, fuzzy
 msgid ""
 "\n"
 "Available columns (for --show, --raw or --pairs):\n"
 msgstr "可用命令：\n"
 
-#: partx/partx.c:607
+#: partx/partx.c:606
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -10116,27 +10257,27 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 setarch(8)。\n"
 
-#: partx/partx.c:615
+#: partx/partx.c:614
 #, fuzzy, c-format
 msgid "the options %s are mutually exclusive"
 msgstr "選項彼此互斥"
 
-#: partx/partx.c:676
+#: partx/partx.c:679
 #, fuzzy
 msgid "failed to parse --nr <M-N> range"
 msgstr "剖析優先權時失敗"
 
-#: partx/partx.c:774
+#: partx/partx.c:777
 #, fuzzy
 msgid "--nr and <partition> are mutually exclusive"
 msgstr "選項彼此互斥"
 
-#: partx/partx.c:793
+#: partx/partx.c:796
 #, c-format
 msgid "partition: %s, disk: %s, lower: %d, upper: %d\n"
 msgstr ""
 
-#: partx/partx.c:812
+#: partx/partx.c:815
 #, fuzzy, c-format
 msgid "%s: failed to initialize blkid prober"
 msgstr "初始化列緩衝區時失敗\n"
@@ -10289,7 +10430,7 @@ msgstr "設定 pid %d 的策略時失敗"
 msgid "failed to set pid %d's policy"
 msgstr "設定 pid %d 的策略時失敗"
 
-#: schedutils/chrt.c:333 term-utils/script.c:447
+#: schedutils/chrt.c:333 term-utils/script.c:446
 #, c-format
 msgid "failed to execute %s"
 msgstr "執行 %s 時失敗"
@@ -10574,7 +10715,7 @@ msgstr "%s：%ld 為預設臨界值以及 %ld 為預設逾時值\n"
 msgid "Can't set signal handler"
 msgstr "無法設定訊號處理程式"
 
-#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:329
+#: sys-utils/cytune.c:325 sys-utils/cytune.c:360 sys-utils/dmesg.c:328
 msgid "gettimeofday failed"
 msgstr "gettimeofday 失敗"
 
@@ -10583,7 +10724,7 @@ msgstr "gettimeofday 失敗"
 msgid "Can't issue CYGETMON on %s: %s\n"
 msgstr "無法發放 CYGETMON 於 %s: %s\n"
 
-#: sys-utils/cytune.c:412
+#: sys-utils/cytune.c:413
 #, c-format
 msgid ""
 "%s: %lu ints, %lu/%lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10591,12 +10732,12 @@ msgstr ""
 "%s：%lu 間隔值，%lu/%lu 字元值；fifo：%lu 臨界值，%lu 逾時值，%lu 最大"
 "值，%lu 當前值\n"
 
-#: sys-utils/cytune.c:418
+#: sys-utils/cytune.c:419
 #, c-format
 msgid "   %f int/sec; %f rec, %f send (char/sec)\n"
 msgstr "   %f 間隔/秒；%f 記錄，%f 發送 (字元/秒)\n"
 
-#: sys-utils/cytune.c:423
+#: sys-utils/cytune.c:424
 #, c-format
 msgid ""
 "%s: %lu ints, %lu chars; fifo: %lu thresh, %lu tmout, %lu max, %lu now\n"
@@ -10604,7 +10745,7 @@ msgstr ""
 "%s：%lu 間隔值，%lu 字元值；fifo：%lu 臨界值，%lu 逾時值，%lu 最大值，%lu 當"
 "前值\n"
 
-#: sys-utils/cytune.c:429
+#: sys-utils/cytune.c:430
 #, c-format
 msgid "   %f int/sec; %f rec (char/sec)\n"
 msgstr "   %f 間隔/秒；%f 記錄 (字元/秒)\n"
@@ -10696,130 +10837,107 @@ msgstr ""
 msgid "ftp daemon"
 msgstr "無法守護程式化"
 
-#: sys-utils/dmesg.c:133 sys-utils/lscpu.c:1037 term-utils/setterm.c:676
-#: text-utils/col.c:120
-#, fuzzy, c-format
+#: sys-utils/dmesg.c:137
 msgid ""
-"\n"
-"Usage:\n"
-" %s [options]\n"
+" -C, --clear                 clear the kernel ring buffer\n"
+" -c, --read-clear            read and clear all messages\n"
+" -D, --console-off           disable printing messages to console\n"
+" -d, --show-delta            show time delta between printed messages\n"
+" -E, --console-on            enable printing messages to console\n"
+" -f, --facility <list>       restrict output to defined facilities\n"
+" -h, --help                  display this help and exit\n"
+" -k, --kernel                display kernel messages\n"
+" -l, --level <list>          restrict output to defined levels\n"
+" -n, --console-level <level> set level of messages printed to console\n"
+" -r, --raw                   print the raw message buffer\n"
+" -s, --buffer-size <size>    buffer size to query the kernel ring buffer\n"
+" -T, --ctime                 show human readable timestamp (could be \n"
+"                             inaccurate if you have used SUSPEND/RESUME)\n"
+" -t, --notime                don't print messages timestamp\n"
+" -u, --userspace             display userspace messages\n"
+" -V, --version               output version information and exit\n"
+" -x, --decode                decode facility and level to readable string\n"
 msgstr ""
-"\n"
-"用法：%s [選項]\n"
-"\n"
 
-#: sys-utils/dmesg.c:137
-#, c-format
+#: sys-utils/dmesg.c:156
 msgid ""
 "\n"
-"Options:\n"
-" -C, --clear               clear the kernel ring buffer\n"
-" -c, --read-clear          read and clear all messages\n"
-" -D, --console-off         disable printing messages to console\n"
-" -d, --show-delta          show time delta between printed messages\n"
-" -E, --console-on          enable printing messages to console\n"
-" -f, --facility=LIST       restrict output to defined facilities\n"
-" -h, --help                display this help and exit\n"
-" -k, --kernel              display kernel messages\n"
-" -l, --level=LIST          restrict output to defined levels\n"
-" -n, --console-level=LEVEL set level of messages printed to console\n"
-" -r, --raw                 print the raw message buffer\n"
-" -s, --buffer-size=SIZE    buffer size to query the kernel ring buffer\n"
-" -T, --ctime               show human readable timestamp (could be \n"
-"                           inaccurate if you have used SUSPEND/RESUME)\n"
-" -t, --notime              don't print messages timestamp\n"
-" -u, --userspace           display userspace messages\n"
-" -V, --version             output version information and exit\n"
-" -x, --decode              decode facility and level to readable string\n"
-"\n"
-msgstr ""
-
-#: sys-utils/dmesg.c:157
-#, c-format
-msgid "Supported log facilities:\n"
+"Supported log facilities:\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:164
-#, c-format
+#: sys-utils/dmesg.c:163
 msgid ""
 "\n"
 "Supported log levels (priorities):\n"
 msgstr ""
 
-#: sys-utils/dmesg.c:208
+#: sys-utils/dmesg.c:207
 #, fuzzy, c-format
 msgid "failed to parse level '%s'"
 msgstr "剖析 %s %s 時失敗"
 
-#: sys-utils/dmesg.c:210
+#: sys-utils/dmesg.c:209
 #, fuzzy, c-format
 msgid "unknown level '%s'"
 msgstr "不明直欄：%s"
 
-#: sys-utils/dmesg.c:246
+#: sys-utils/dmesg.c:245
 #, fuzzy, c-format
 msgid "failed to parse facility '%s'"
 msgstr "剖析 %s %s 時失敗"
 
-#: sys-utils/dmesg.c:248
+#: sys-utils/dmesg.c:247
 #, fuzzy, c-format
 msgid "unknown facility '%s'"
 msgstr "不明方向「%s」"
 
-#: sys-utils/dmesg.c:327
+#: sys-utils/dmesg.c:326
 #, fuzzy
 msgid "sysinfo failed"
 msgstr "fsync 失敗"
 
-#: sys-utils/dmesg.c:419 term-utils/script.c:303 term-utils/script.c:395
+#: sys-utils/dmesg.c:420 term-utils/script.c:302 term-utils/script.c:394
 #, fuzzy
 msgid "write failed"
 msgstr "寫入失敗：%s"
 
-#: sys-utils/dmesg.c:616
+#: sys-utils/dmesg.c:619
 msgid ""
 "clear, read-clear, console-level, console-on, and console-off options are "
 "mutually exclusive"
 msgstr ""
 
-#: sys-utils/dmesg.c:664
+#: sys-utils/dmesg.c:667
 #, fuzzy
 msgid "failed to parse buffer size"
 msgstr "剖析 %s %s 時失敗"
 
-#: sys-utils/dmesg.c:705
+#: sys-utils/dmesg.c:708
 msgid ""
 "--raw can't be used together with level, facility, decode, delta, ctime or "
 "notime options"
 msgstr ""
 
-#: sys-utils/dmesg.c:709
+#: sys-utils/dmesg.c:712
 msgid "--notime can't be used together with ctime "
 msgstr ""
 
-#: sys-utils/dmesg.c:730
+#: sys-utils/dmesg.c:733
 #, fuzzy
 msgid "unsupported command"
 msgstr "沒有命令？\n"
 
-#: sys-utils/dmesg.c:735
+#: sys-utils/dmesg.c:738
 #, fuzzy
 msgid "klogctl failed"
 msgstr "msgctl 失敗"
 
-#: sys-utils/fallocate.c:52
-#, c-format
-msgid ""
-"Usage: %s [options] <filename>\n"
-"\n"
-"Options:\n"
-msgstr ""
-"用法：%s [選項] <檔案名稱>\n"
-"\n"
-"選項：\n"
+#: sys-utils/fallocate.c:55
+#, fuzzy, c-format
+msgid " %s [options] <filename>\n"
+msgstr "用法：%s [選項] 裝置…\n"
 
-#: sys-utils/fallocate.c:56
-#, c-format
+#: sys-utils/fallocate.c:58
 msgid ""
 " -h, --help          this help\n"
 " -n, --keep-size     don't modify the length of the file\n"
@@ -10831,7 +10949,7 @@ msgstr ""
 " -o, --offset <num>  以位元組為單位的配置偏移值\n"
 " -l, --length <num>  以位元組為單位的配置長度\n"
 
-#: sys-utils/fallocate.c:61
+#: sys-utils/fallocate.c:63
 #, c-format
 msgid ""
 "\n"
@@ -10840,31 +10958,31 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 fallocate(1)。\n"
 
-#: sys-utils/fallocate.c:119
+#: sys-utils/fallocate.c:121
 msgid "no length argument specified"
 msgstr "未指定任何長度引數"
 
-#: sys-utils/fallocate.c:121
+#: sys-utils/fallocate.c:123
 msgid "invalid length value specified"
 msgstr "指定了無效的長度值"
 
-#: sys-utils/fallocate.c:123
+#: sys-utils/fallocate.c:125
 msgid "invalid offset value specified"
 msgstr "指定了無效的偏移值"
 
-#: sys-utils/fallocate.c:125
+#: sys-utils/fallocate.c:127
 msgid "no filename specified."
 msgstr "未指定任何檔名。"
 
-#: sys-utils/fallocate.c:130 sys-utils/fsfreeze.c:95 sys-utils/fstrim.c:129
+#: sys-utils/fallocate.c:132 sys-utils/fsfreeze.c:96 sys-utils/fstrim.c:130
 msgid "unexpected number of arguments"
 msgstr "未預期的引數數量"
 
-#: sys-utils/fallocate.c:150
+#: sys-utils/fallocate.c:152
 msgid "keep size mode (-n option) unsupported"
 msgstr "保持大小模式 (-n 選項) 未受支援"
 
-#: sys-utils/fallocate.c:151
+#: sys-utils/fallocate.c:153
 #, c-format
 msgid "%s: fallocate failed"
 msgstr "%s：fallocate 失敗"
@@ -10872,18 +10990,24 @@ msgstr "%s：fallocate 失敗"
 #: sys-utils/flock.c:67
 #, c-format
 msgid ""
-"Usage: %1$s [-sxun][-w #] fd#\n"
-"       %1$s [-sxon][-w #] file [-c] command...\n"
-"       %1$s [-sxon][-w #] directory [-c] command...\n"
-"  -s  --shared     Get a shared lock\n"
-"  -x  --exclusive  Get an exclusive lock\n"
-"  -u  --unlock     Remove a lock\n"
-"  -n  --nonblock   Fail rather than wait\n"
-"  -w  --timeout    Wait for a limited amount of time\n"
-"  -o  --close      Close file descriptor before running command\n"
-"  -c  --command    Run a single command string through the shell\n"
-"  -h  --help       Display this text\n"
-"  -V  --version    Display version\n"
+" %1$s [-sxun][-w #] fd#\n"
+" %1$s [-sxon][-w #] file [-c] command...\n"
+" %1$s [-sxon][-w #] directory [-c] command...\n"
+msgstr ""
+
+#: sys-utils/flock.c:72
+#, fuzzy
+msgid ""
+" -s  --shared     Get a shared lock\n"
+" -x  --exclusive  Get an exclusive lock\n"
+" -u  --unlock     Remove a lock\n"
+" -n  --nonblock   Fail rather than wait\n"
+" -w  --timeout    Wait for a limited amount of time\n"
+" -o  --close      Close file descriptor before running command\n"
+" -c  --command    Run a single command string through the shell\n"
+" -h  --help       Display this text\n"
+" -V  --version    Display version\n"
+"\n"
 msgstr ""
 "用法：%1$s [-sxun ][-w #] fd#\n"
 "      %1$s [-sxon ][-w #] 檔案 [-c] 命令…\n"
@@ -10898,55 +11022,51 @@ msgstr ""
 "  -h  --help       顯示這個說明\n"
 "  -V  --version    顯示版本\n"
 
-#: sys-utils/flock.c:194
+#: sys-utils/flock.c:195
 #, c-format
 msgid "%s: %s requires exactly one command argument\n"
 msgstr "%s：%s 需要剛好一個指令引數\n"
 
-#: sys-utils/flock.c:221
+#: sys-utils/flock.c:222
 #, c-format
 msgid "%s: cannot open lock file %s: %s\n"
 msgstr "%s：無法開啟鎖定檔案 %s：%s\n"
 
-#: sys-utils/flock.c:233
+#: sys-utils/flock.c:234
 #, c-format
 msgid "%s: bad number: %s\n"
 msgstr "%s：不當的數字：%s\n"
 
-#: sys-utils/flock.c:240
+#: sys-utils/flock.c:241
 #, c-format
 msgid "%s: requires file descriptor, file or directory\n"
 msgstr "%s：需要檔案描述符號、檔案或目錄\n"
 
-#: sys-utils/flock.c:298
+#: sys-utils/flock.c:299
 #, c-format
 msgid "%s: fork failed: %s\n"
 msgstr "%s：衍生執行時失敗：%s\n"
 
-#: sys-utils/fsfreeze.c:40 sys-utils/fstrim.c:55
-#, c-format
-msgid ""
-"Usage: %s [options] <mount point>\n"
-"\n"
-"Options:\n"
+#: sys-utils/fsfreeze.c:42 sys-utils/fstrim.c:57
+#, fuzzy, c-format
+msgid " %s [options] <mount point>\n"
 msgstr ""
 "用法：%s [選項] <掛載點>\n"
 "\n"
 "選項：\n"
 
-#: sys-utils/fsfreeze.c:44
-#, c-format
+#: sys-utils/fsfreeze.c:45
+#, fuzzy
 msgid ""
-" -h, --help          this help\n"
-" -f, --freeze        freeze the filesystem\n"
-" -u, --unfreeze      unfreeze the filesystem\n"
+" -h, --help        this help\n"
+" -f, --freeze      freeze the filesystem\n"
+" -u, --unfreeze    unfreeze the filesystem\n"
 msgstr ""
 " -h, --help          這個說明\n"
 " -f, --freeze        凍結檔案系統\n"
 " -u, --unfreeze      解除檔案系統凍結\n"
 
-#: sys-utils/fsfreeze.c:48
-#, c-format
+#: sys-utils/fsfreeze.c:49
 msgid ""
 "\n"
 "For more information see fsfreeze(8).\n"
@@ -10954,36 +11074,35 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 fsfreeze(8)。\n"
 
-#: sys-utils/fsfreeze.c:89
+#: sys-utils/fsfreeze.c:90
 msgid "no action specified"
 msgstr "未指定任何動作"
 
-#: sys-utils/fsfreeze.c:91
+#: sys-utils/fsfreeze.c:92
 msgid "no filename specified"
 msgstr "未指定任何檔名"
 
-#: sys-utils/fsfreeze.c:104
+#: sys-utils/fsfreeze.c:105
 #, c-format
 msgid "%s: fstat failed"
 msgstr "%s：fstat 失敗"
 
-#: sys-utils/fsfreeze.c:109
+#: sys-utils/fsfreeze.c:110
 #, c-format
 msgid "%s: is not a directory"
 msgstr "%s：並非目錄"
 
-#: sys-utils/fsfreeze.c:115
+#: sys-utils/fsfreeze.c:116
 #, c-format
 msgid "%s: freeze failed"
 msgstr "%s：凍結時失敗"
 
-#: sys-utils/fsfreeze.c:120
+#: sys-utils/fsfreeze.c:121
 #, c-format
 msgid "%s: unfreeze failed"
 msgstr "%s：解除凍結時失敗"
 
-#: sys-utils/fstrim.c:59
-#, c-format
+#: sys-utils/fstrim.c:60
 msgid ""
 " -h, --help          this help\n"
 " -o, --offset <num>  offset in bytes to discard from\n"
@@ -10992,8 +11111,8 @@ msgid ""
 " -v, --verbose       print number of discarded bytes\n"
 msgstr ""
 
-#: sys-utils/fstrim.c:65
-#, fuzzy, c-format
+#: sys-utils/fstrim.c:66
+#, fuzzy
 msgid ""
 "\n"
 "For more information see fstrim(1).\n"
@@ -11001,99 +11120,88 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 findmnt(1)。\n"
 
-#: sys-utils/fstrim.c:101
+#: sys-utils/fstrim.c:102
 #, fuzzy, c-format
 msgid "failed to parse length: %s"
 msgstr "剖析 %s %s 時失敗"
 
-#: sys-utils/fstrim.c:106
+#: sys-utils/fstrim.c:107
 #, fuzzy, c-format
 msgid "failed to parse offset: %s"
 msgstr "剖析 %s %s 時失敗"
 
-#: sys-utils/fstrim.c:111
+#: sys-utils/fstrim.c:112
 #, fuzzy, c-format
 msgid "failed to parse minimum extent length: %s"
 msgstr "讀取時序檔案 %s 時失敗"
 
-#: sys-utils/fstrim.c:124
+#: sys-utils/fstrim.c:125
 #, fuzzy
 msgid "no mountpoint specified."
 msgstr "未指定任何動作"
 
-#: sys-utils/fstrim.c:136 sys-utils/mountpoint.c:155
+#: sys-utils/fstrim.c:137 sys-utils/mountpoint.c:153
 #, fuzzy, c-format
 msgid "%s: not a directory"
 msgstr "%s：並非目錄"
 
-#: sys-utils/fstrim.c:143
+#: sys-utils/fstrim.c:144
 #, fuzzy, c-format
 msgid "%s: FITRIM ioctl failed"
 msgstr "%s：寫入失敗"
 
-#: sys-utils/fstrim.c:146
+#. TRANSLATORS: The standard value here is a very large number.
+#: sys-utils/fstrim.c:148
 #, c-format
-msgid "%s: %<PRIu64> bytes was trimmed\n"
-msgstr ""
-
-#: sys-utils/ipcmk.c:84
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [options]\n"
-"\n"
+msgid "%s: %<PRIu64> bytes were trimmed\n"
 msgstr ""
-"\n"
-"用法：%s [選項]\n"
-"\n"
 
-#: sys-utils/ipcmk.c:86
-#, c-format
+#: sys-utils/ipcmk.c:91
+#, fuzzy
 msgid ""
-"  -M <size>     create shared memory segment of size <size>\n"
-"  -S <nsems>    create semaphore array with <nsems> elements\n"
-"  -Q            create message queue\n"
-"  -p <mode>     permission for the resource (default is 0644)\n"
+" -M <size>     create shared memory segment of size <size>\n"
+" -S <nsems>    create semaphore array with <nsems> elements\n"
+" -Q            create message queue\n"
+" -p <mode>     permission for the resource (default is 0644)\n"
 msgstr ""
 "  -M <size>     以 <size> 大小建立共用記憶體資料段\n"
 "  -S <nsems>    以 <nsems> 元件建立號誌陣列\n"
 "  -Q            建立訊息佇列\n"
 "  -p <mode>     用於資源的權限 (預設是 0644)\n"
 
-#: sys-utils/ipcmk.c:90
-#, c-format
+#: sys-utils/ipcmk.c:96
+#, fuzzy
 msgid ""
 "\n"
 "For more information see ipcmk(1).\n"
-"\n"
 msgstr ""
 "\n"
 "要獲得更多資訊請參看 ipcmk(1)。\n"
 "\n"
 
-#: sys-utils/ipcmk.c:142
+#: sys-utils/ipcmk.c:148
 msgid "create share memory failed"
 msgstr "建立共享記憶體時失敗"
 
-#: sys-utils/ipcmk.c:144
+#: sys-utils/ipcmk.c:150
 #, c-format
 msgid "Shared memory id: %d\n"
 msgstr "共用記憶體識別號：%d\n"
 
-#: sys-utils/ipcmk.c:150
+#: sys-utils/ipcmk.c:156
 msgid "create message queue failed"
 msgstr "建立訊息佇列時失敗"
 
-#: sys-utils/ipcmk.c:152
+#: sys-utils/ipcmk.c:158
 #, c-format
 msgid "Message queue id: %d\n"
 msgstr "訊息佇列識別號：%d\n"
 
-#: sys-utils/ipcmk.c:158
+#: sys-utils/ipcmk.c:164
 msgid "create semaphore failed"
 msgstr "建立號誌時失敗"
 
-#: sys-utils/ipcmk.c:160
+#: sys-utils/ipcmk.c:166
 #, c-format
 msgid "Semaphore id: %d\n"
 msgstr "號誌識別號：%d\n"
@@ -11607,8 +11715,8 @@ msgstr ""
 "共用記憶體資料段 shmid = %d\n"
 
 #: sys-utils/ipcs.c:621
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\n"
 
 #: sys-utils/ipcs.c:623
@@ -11617,8 +11725,8 @@ msgid "mode=%#o\taccess_perms=%#o\n"
 msgstr "mode=%#o\taccess_perms=%#o\n"
 
 #: sys-utils/ipcs.c:625
-#, c-format
-msgid "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
+#, fuzzy, c-format
+msgid "bytes=%lu\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 msgstr "bytes=%ld\tlpid=%d\tcpid=%d\tnattch=%ld\n"
 
 #: sys-utils/ipcs.c:628
@@ -11650,8 +11758,8 @@ msgstr ""
 "訊息佇列 msqid=%d\n"
 
 #: sys-utils/ipcs.c:647
-#, c-format
-msgid "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
+#, fuzzy, c-format
+msgid "uid=%u\tgid=%u\tcuid=%u\tcgid=%u\tmode=%#o\n"
 msgstr "uid=%d\tgid=%d\tcuid=%d\tcgid=%d\tmode=%#o\n"
 
 #: sys-utils/ipcs.c:649
@@ -11683,8 +11791,8 @@ msgstr ""
 "號誌陣列 semid=%d\n"
 
 #: sys-utils/ipcs.c:680
-#, c-format
-msgid "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
+#, fuzzy, c-format
+msgid "uid=%u\t gid=%u\t cuid=%u\t cgid=%u\n"
 msgstr "uid=%d\t gid=%d\t cuid=%d\t cgid=%d\n"
 
 #: sys-utils/ipcs.c:682
@@ -11732,16 +11840,14 @@ msgstr "pid"
 msgid "invalid iflag: %s"
 msgstr "無效的 iflag：%s"
 
-#: sys-utils/ldattach.c:150
-#, c-format
-msgid ""
-"\n"
-"Usage: %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
+#: sys-utils/ldattach.c:151
+#, fuzzy, c-format
+msgid " %s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 msgstr ""
 "\n"
 "用法：%s [ -dhV78neo12 ] [ -s <speed> ] [ -i [-]<iflag> ] <ldisc> <device>\n"
 
-#: sys-utils/ldattach.c:152
+#: sys-utils/ldattach.c:154
 msgid ""
 "\n"
 "Known <ldisc> names:\n"
@@ -11749,7 +11855,7 @@ msgstr ""
 "\n"
 "已知 <ldisc> 名稱：\n"
 
-#: sys-utils/ldattach.c:154
+#: sys-utils/ldattach.c:157
 msgid ""
 "\n"
 "Known <iflag> names:\n"
@@ -11757,50 +11863,50 @@ msgstr ""
 "\n"
 "已知 <iflag> 名稱：\n"
 
-#: sys-utils/ldattach.c:239
+#: sys-utils/ldattach.c:243
 #, c-format
 msgid "invalid speed: %s"
 msgstr "無效的速度：%s"
 
-#: sys-utils/ldattach.c:245
+#: sys-utils/ldattach.c:249
 #, c-format
 msgid "ldattach from %s\n"
 msgstr "ldattach 自 %s\n"
 
-#: sys-utils/ldattach.c:250
+#: sys-utils/ldattach.c:254
 msgid "invalid option"
 msgstr "無效的選項"
 
-#: sys-utils/ldattach.c:263
+#: sys-utils/ldattach.c:267
 #, c-format
 msgid "invalid line discipline: %s"
 msgstr "無效的線路規律：%s"
 
-#: sys-utils/ldattach.c:271
+#: sys-utils/ldattach.c:275
 #, c-format
 msgid "%s is not a serial line"
 msgstr "%s 並非序列線路"
 
-#: sys-utils/ldattach.c:277
+#: sys-utils/ldattach.c:281
 #, c-format
 msgid "cannot get terminal attributes for %s"
 msgstr "無法取得終端機屬性用於 %s"
 
-#: sys-utils/ldattach.c:280
+#: sys-utils/ldattach.c:284
 #, c-format
 msgid "speed %d unsupported"
 msgstr "速度 %d 不受支援"
 
-#: sys-utils/ldattach.c:315
+#: sys-utils/ldattach.c:319
 #, c-format
 msgid "cannot set terminal attributes for %s"
 msgstr "無法設定終端機屬性用於 %s"
 
-#: sys-utils/ldattach.c:322
+#: sys-utils/ldattach.c:326
 msgid "cannot set line discipline"
 msgstr "無法設定線路規律"
 
-#: sys-utils/ldattach.c:328
+#: sys-utils/ldattach.c:332
 msgid "cannot daemonize"
 msgstr "無法守護程式化"
 
@@ -11956,15 +12062,14 @@ msgstr "%s 快取："
 msgid "NUMA node%d CPU(s):"
 msgstr "NUMA node%d CPU(s)："
 
-#: sys-utils/lscpu.c:1040
+#: sys-utils/lscpu.c:1041
 #, fuzzy
 msgid ""
+" -h, --help          print this help\n"
+" -p, --parse <list>  print out a parsable instead of a readable format\n"
+" -s, --sysroot <dir> use directory DIR as system root\n"
+" -x, --hex           print hexadecimal masks rather than lists of CPUs\n"
 "\n"
-"Options:\n"
-"  -h, --help         print this help\n"
-"  -p, --parse[=LIST] print out a parsable instead of a readable format\n"
-"  -s, --sysroot DIR  use directory DIR as system root\n"
-"  -x, --hex          print hexadecimal masks rather than lists of CPUs\n"
 msgstr ""
 "CPU 架構資訊輔助程式\n"
 "\n"
@@ -11972,26 +12077,22 @@ msgstr ""
 "  -p, --parse    以可剖析格式印出以代替可列印格式。\n"
 "  -s, --sysroot  使用此目錄做為新系統的根目錄。\n"
 
-#: sys-utils/mountpoint.c:79
+#: sys-utils/mountpoint.c:81
 #, c-format
 msgid ""
-"Usage:\n"
 " %1$s [-qd] /path/to/directory\n"
 " %1$s -x /dev/device\n"
 msgstr ""
 
 #: sys-utils/mountpoint.c:85
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -q, --quiet        quiet mode - don't print anything\n"
 " -d, --fs-devno     print maj:min device number of the filesystem\n"
 " -x, --devno        print maj:min device number of the block device\n"
 " -h, --help         this help\n"
 msgstr ""
 
-#: sys-utils/mountpoint.c:92
+#: sys-utils/mountpoint.c:90
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12001,12 +12102,12 @@ msgstr ""
 "要獲得更多資訊請參看 ipcmk(1)。\n"
 "\n"
 
-#: sys-utils/mountpoint.c:161
+#: sys-utils/mountpoint.c:159
 #, fuzzy, c-format
 msgid "%s is not a mountpoint\n"
 msgstr "%s：並非目錄"
 
-#: sys-utils/mountpoint.c:167
+#: sys-utils/mountpoint.c:165
 #, fuzzy, c-format
 msgid "%s is a mountpoint\n"
 msgstr "%s 已掛載。\t"
@@ -12042,45 +12143,43 @@ msgstr ""
 "\t -n            停用位元組次序的自動偵測\n"
 "\t -V            印出版本然後離開\n"
 
-#: sys-utils/readprofile.c:213
+#: sys-utils/readprofile.c:214
 #, c-format
 msgid "readprofile: error writing %s: %s\n"
 msgstr "readprofile：寫入 %s 時錯誤：%s\n"
 
-#: sys-utils/readprofile.c:251
+#: sys-utils/readprofile.c:254
 #, c-format
 msgid "Assuming reversed byte order. Use -n to force native byte order.\n"
 msgstr "假設反向的位元組次序。使用 -n 以強制原生位元組次序。\n"
 
-#: sys-utils/readprofile.c:267
+#: sys-utils/readprofile.c:270
 #, c-format
 msgid "Sampling_step: %i\n"
 msgstr "取樣率：%i\n"
 
-#: sys-utils/readprofile.c:288 sys-utils/readprofile.c:314
+#: sys-utils/readprofile.c:291 sys-utils/readprofile.c:317
 #, c-format
 msgid "%s: %s(%i): wrong map line\n"
 msgstr "%s: %s(%i)：錯誤對映列\n"
 
-#: sys-utils/readprofile.c:301
+#: sys-utils/readprofile.c:304
 #, c-format
 msgid "%s: can't find \"_stext\" in %s\n"
 msgstr "%s：在 %s 中找不到「_stext」\n"
 
-#: sys-utils/readprofile.c:337
+#: sys-utils/readprofile.c:340
 #, c-format
 msgid "%s: profile address out of range. Wrong map file?\n"
 msgstr "%s：側寫檔位址超出範圍。錯誤的對映檔案？\n"
 
-#: sys-utils/readprofile.c:397
+#: sys-utils/readprofile.c:400
 msgid "total"
 msgstr "總計"
 
-#: sys-utils/renice.c:55
+#: sys-utils/renice.c:56
 #, fuzzy, c-format
 msgid ""
-"\n"
-"Usage:\n"
 " %1$s [-n] <priority> [-p] <pid> [<pid>  ...]\n"
 " %1$s [-n] <priority>  -g <pgrp> [<pgrp> ...]\n"
 " %1$s [-n] <priority>  -u <user> [<user> ...]\n"
@@ -12095,10 +12194,7 @@ msgstr ""
 "\n"
 
 #: sys-utils/renice.c:62
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
 " -g, --pgrp <id>        interpret as process group ID\n"
 " -h, --help             print help\n"
 " -n, --priority <num>   set the nice increment value\n"
@@ -12107,8 +12203,8 @@ msgid ""
 " -v, --version          print version\n"
 msgstr ""
 
-#: sys-utils/renice.c:70
-#, fuzzy, c-format
+#: sys-utils/renice.c:69
+#, fuzzy
 msgid ""
 "\n"
 "For more information see renice(1).\n"
@@ -12116,72 +12212,61 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 namei(1)。\n"
 
-#: sys-utils/renice.c:101
+#: sys-utils/renice.c:100
 #, c-format
 msgid "renice from %s\n"
 msgstr "renice 自 %s\n"
 
-#: sys-utils/renice.c:138
+#: sys-utils/renice.c:137
 #, fuzzy, c-format
 msgid "unknown user %s"
 msgstr "不明直欄：%s"
 
-#: sys-utils/renice.c:145
+#: sys-utils/renice.c:144
 #, fuzzy, c-format
 msgid "bad value %s"
 msgstr "不當的逾時設定值：%s"
 
-#: sys-utils/renice.c:157
+#: sys-utils/renice.c:156
 msgid "process ID"
 msgstr ""
 
-#: sys-utils/renice.c:160
+#: sys-utils/renice.c:159
 #, fuzzy
 msgid "user ID"
 msgstr "使用者"
 
-#: sys-utils/renice.c:162
+#: sys-utils/renice.c:161
 msgid "process group ID"
 msgstr ""
 
-#: sys-utils/renice.c:167 sys-utils/renice.c:177
+#: sys-utils/renice.c:166 sys-utils/renice.c:176
 #, fuzzy, c-format
 msgid "failed to get priority for %d (%s)"
 msgstr "設定身分為 %s 時失敗"
 
-#: sys-utils/renice.c:171
+#: sys-utils/renice.c:170
 #, fuzzy, c-format
 msgid "failed to set priority for %d (%s)"
 msgstr "設定身分為 %s 時失敗"
 
-#: sys-utils/renice.c:181
+#: sys-utils/renice.c:180
 #, fuzzy, c-format
 msgid "%d (%s) old priority %d, new priority %d\n"
 msgstr "%d: 舊的優先權 %d, 新的優先權 %d\n"
 
-#: sys-utils/rtcwake.c:86
-#, fuzzy, c-format
-msgid ""
-"Usage: %s [options]\n"
-"\n"
-"Options:\n"
-msgstr ""
-"用法：%s [選項] <裝置>\n"
-"\n"
-"選項：\n"
-
-#: sys-utils/rtcwake.c:90
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:91
+#, fuzzy
 msgid ""
-"    -d | --device <device>    select rtc device (rtc0|rtc1|...)\n"
-"    -n | --dry-run            does everything, but suspend\n"
-"    -l | --local              RTC uses local timezone\n"
-"    -m | --mode <mode>        standby|mem|... sleep mode\n"
-"    -s | --seconds <seconds>  seconds to sleep\n"
-"    -t | --time <time_t>      time to wake\n"
-"    -u | --utc                RTC uses UTC\n"
-"    -v | --verbose            verbose messages\n"
-"    -V | --version            show version\n"
+" -d, --device <device>    select rtc device (rtc0|rtc1|...)\n"
+" -n, --dry-run            does everything, but suspend\n"
+" -l, --local              RTC uses local timezone\n"
+" -m, --mode <mode>        standby|mem|... sleep mode\n"
+" -s, --seconds <seconds>  seconds to sleep\n"
+" -t, --time <time_t>      time to wake\n"
+" -u, --utc                RTC uses UTC\n"
+" -v, --verbose            verbose messages\n"
+" -V, --version            show version\n"
 msgstr ""
 "用法：%s [選項]\n"
 "    -d | --device <device>    選取 rtc 裝置 (rtc0|rtc1|...)\n"
@@ -12194,8 +12279,8 @@ msgstr ""
 "    -v | --verbose            詳細的訊息\n"
 "    -V | --version            顯示版本\n"
 
-#: sys-utils/rtcwake.c:100
-#, fuzzy, c-format
+#: sys-utils/rtcwake.c:101
+#, fuzzy
 msgid ""
 "\n"
 "For more information see rtcwake(8).\n"
@@ -12203,162 +12288,162 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 taskset(1)。\n"
 
-#: sys-utils/rtcwake.c:151
+#: sys-utils/rtcwake.c:152
 #, fuzzy
 msgid "read rtc time failed"
 msgstr "讀取 rtc 時間"
 
-#: sys-utils/rtcwake.c:156
+#: sys-utils/rtcwake.c:157
 #, fuzzy
 msgid "read system time failed"
 msgstr "讀取系統時間"
 
-#: sys-utils/rtcwake.c:174
+#: sys-utils/rtcwake.c:175
 #, fuzzy
 msgid "convert rtc time failed"
 msgstr "轉換 rtc 時間"
 
-#: sys-utils/rtcwake.c:234
+#: sys-utils/rtcwake.c:235
 #, fuzzy
 msgid "set rtc alarm failed"
 msgstr "設定 rtc 警示"
 
-#: sys-utils/rtcwake.c:238
+#: sys-utils/rtcwake.c:239
 #, fuzzy
 msgid "enable rtc alarm failed"
 msgstr "啟用 rtc 警示"
 
-#: sys-utils/rtcwake.c:242
+#: sys-utils/rtcwake.c:243
 #, fuzzy
 msgid "set rtc wake alarm failed"
 msgstr "設定 rtc 喚醒警示"
 
-#: sys-utils/rtcwake.c:344
+#: sys-utils/rtcwake.c:345
 #, fuzzy
 msgid "read rtc alarm failed"
 msgstr "啟用 rtc 警示"
 
-#: sys-utils/rtcwake.c:350
+#: sys-utils/rtcwake.c:351
 #, c-format
 msgid "alarm: off\n"
 msgstr ""
 
-#: sys-utils/rtcwake.c:367
+#: sys-utils/rtcwake.c:368
 #, fuzzy
 msgid "convert time failed"
 msgstr "轉換 rtc 時間"
 
-#: sys-utils/rtcwake.c:374
+#: sys-utils/rtcwake.c:375
 #, c-format
 msgid "alarm: on  %s"
 msgstr ""
 
-#: sys-utils/rtcwake.c:430
+#: sys-utils/rtcwake.c:431
 #, fuzzy, c-format
 msgid "unrecognized suspend state '%s'"
 msgstr "%s：無法辨識的懸置狀態「%s」\n"
 
-#: sys-utils/rtcwake.c:441
+#: sys-utils/rtcwake.c:442
 #, fuzzy
 msgid "failed to parse seconds value"
 msgstr "剖析 %s %s 時失敗"
 
-#: sys-utils/rtcwake.c:449
+#: sys-utils/rtcwake.c:450
 #, fuzzy
 msgid "failed to parse time_t value"
 msgstr "剖析 pid 時失敗"
 
-#: sys-utils/rtcwake.c:473
+#: sys-utils/rtcwake.c:474
 #, c-format
 msgid "%s: assuming RTC uses UTC ...\n"
 msgstr "%s：假設 RTC 使用 UTC ...\n"
 
-#: sys-utils/rtcwake.c:479
+#: sys-utils/rtcwake.c:480
 #, c-format
 msgid "Using UTC time.\n"
 msgstr "使用 UTC 時間。\n"
 
-#: sys-utils/rtcwake.c:480
+#: sys-utils/rtcwake.c:481
 #, c-format
 msgid "Using local time.\n"
 msgstr "使用當地時間。\n"
 
-#: sys-utils/rtcwake.c:485
+#: sys-utils/rtcwake.c:486
 #, fuzzy
 msgid "must provide wake time (see -t and -s options)"
 msgstr "%s：必須提供喚醒時間\n"
 
-#: sys-utils/rtcwake.c:503
+#: sys-utils/rtcwake.c:504
 #, fuzzy, c-format
 msgid "%s not enabled for wakeup events"
 msgstr "%s: %s 未啟用喚醒事件\n"
 
-#: sys-utils/rtcwake.c:518
+#: sys-utils/rtcwake.c:519
 #, c-format
 msgid "alarm %ld, sys_time %ld, rtc_time %ld, seconds %u\n"
 msgstr "警示 %ld，系統時間 %ld，rtc 時間 %ld，秒數 %u\n"
 
-#: sys-utils/rtcwake.c:524
+#: sys-utils/rtcwake.c:525
 #, c-format
 msgid "suspend to \"%s\" unavailable"
 msgstr ""
 
-#: sys-utils/rtcwake.c:532
+#: sys-utils/rtcwake.c:533
 #, fuzzy, c-format
 msgid "time doesn't go backward to %s"
 msgstr "%s：時間無法後退到 %s\n"
 
-#: sys-utils/rtcwake.c:542
+#: sys-utils/rtcwake.c:543
 #, fuzzy, c-format
 msgid "%s: wakeup using %s at %s"
 msgstr "%1$s：使用 %3$s 於 %4$s 自「%2$s」喚醒\n"
 
-#: sys-utils/rtcwake.c:546
+#: sys-utils/rtcwake.c:547
 #, fuzzy, c-format
 msgid "%s: wakeup from \"%s\" using %s at %s"
 msgstr "%1$s：使用 %3$s 於 %4$s 自「%2$s」喚醒\n"
 
-#: sys-utils/rtcwake.c:555
+#: sys-utils/rtcwake.c:556
 #, c-format
 msgid "suspend mode: no; leaving\n"
 msgstr "懸置模式：無；離開\n"
 
-#: sys-utils/rtcwake.c:563
+#: sys-utils/rtcwake.c:564
 #, c-format
 msgid "suspend mode: off; executing %s\n"
 msgstr "懸置模式：關閉；執行 %s\n"
 
-#: sys-utils/rtcwake.c:573
+#: sys-utils/rtcwake.c:574
 #, fuzzy, c-format
 msgid "unable to execute %s"
 msgstr "執行 %s 時失敗"
 
-#: sys-utils/rtcwake.c:581
+#: sys-utils/rtcwake.c:582
 #, c-format
 msgid "suspend mode: on; reading rtc\n"
 msgstr "懸置模式：開啟；讀取 rtc\n"
 
-#: sys-utils/rtcwake.c:587
+#: sys-utils/rtcwake.c:588
 #, fuzzy
 msgid "rtc read failed"
 msgstr "讀取失敗：%s"
 
-#: sys-utils/rtcwake.c:598
+#: sys-utils/rtcwake.c:599
 #, c-format
 msgid "suspend mode: disable; disabling alarm\n"
 msgstr "懸置模式：停用；停用警示\n"
 
-#: sys-utils/rtcwake.c:602
+#: sys-utils/rtcwake.c:603
 #, fuzzy, c-format
 msgid "suspend mode: show; printing alarm info\n"
 msgstr "懸置模式：停用；停用警示\n"
 
-#: sys-utils/rtcwake.c:609
+#: sys-utils/rtcwake.c:610
 #, c-format
 msgid "suspend mode: %s; suspending system\n"
 msgstr "懸置模式：%s；懸置系統\n"
 
-#: sys-utils/rtcwake.c:615
+#: sys-utils/rtcwake.c:616
 #, fuzzy
 msgid "disable rtc alarm interrupt failed"
 msgstr "停用 rtc 警示插斷"
@@ -12430,16 +12515,16 @@ msgstr ""
 "%s: %s\n"
 "嘗試「%s --help」以獲得更多資訊。\n"
 
-#: sys-utils/setarch.c:214 sys-utils/setarch.c:230
+#: sys-utils/setarch.c:214 sys-utils/setarch.c:229
 #, c-format
 msgid "%s: Unrecognized architecture"
 msgstr "%s：無法辨識的架構"
 
-#: sys-utils/setarch.c:248 sys-utils/setarch.c:255
+#: sys-utils/setarch.c:247 sys-utils/setarch.c:254
 msgid "Not enough arguments"
 msgstr "引數不足"
 
-#: sys-utils/setarch.c:264 sys-utils/setarch.c:317
+#: sys-utils/setarch.c:263 sys-utils/setarch.c:316
 #, c-format
 msgid "Failed to set personality to %s"
 msgstr "設定身分為 %s 時失敗"
@@ -12522,20 +12607,19 @@ msgstr "%s 正在使用 IRQ %d\n"
 msgid "%s using polling\n"
 msgstr "%s 正在使用輪詢\n"
 
-#: sys-utils/unshare.c:57
-#, c-format
-msgid "Usage: %s [options] <program> [args...]\n"
+#: sys-utils/unshare.c:59
+#, fuzzy, c-format
+msgid " %s [options] <program> [args...]\n"
 msgstr "用法：%s [選項] <程式> [引數...]\n"
 
-#: sys-utils/unshare.c:60
+#: sys-utils/unshare.c:62
+#, fuzzy
 msgid ""
-"Run program with some namespaces unshared from parent\n"
-"\n"
-"  -h, --help        usage information (this)\n"
-"  -m, --mount       unshare mounts namespace\n"
-"  -u, --uts         unshare UTS namespace (hostname etc)\n"
-"  -i, --ipc         unshare System V IPC namespace\n"
-"  -n, --net         unshare network namespace\n"
+" -h, --help        usage information (this)\n"
+" -m, --mount       unshare mounts namespace\n"
+" -u, --uts         unshare UTS namespace (hostname etc)\n"
+" -i, --ipc         unshare System V IPC namespace\n"
+" -n, --net         unshare network namespace\n"
 msgstr ""
 "以某些自上層分享的命名空間來執行程式\n"
 "\n"
@@ -12545,8 +12629,7 @@ msgstr ""
 "  -i, --ipc         取消分享 System V IPC 命名空間\n"
 "  -n, --net         取消分享網路命名空間\n"
 
-#: sys-utils/unshare.c:67
-#, c-format
+#: sys-utils/unshare.c:68
 msgid ""
 "\n"
 "For more information see unshare(1).\n"
@@ -12554,147 +12637,147 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 unshare(1)。\n"
 
-#: sys-utils/unshare.c:115
+#: sys-utils/unshare.c:116
 msgid "unshare failed"
 msgstr "unshare 失敗"
 
-#: sys-utils/unshare.c:119
+#: sys-utils/unshare.c:120
 msgid "cannot set group id"
 msgstr "無法設定群組識別號"
 
-#: sys-utils/unshare.c:122
+#: sys-utils/unshare.c:123
 msgid "cannot set user id"
 msgstr "無法設定使用者識別號"
 
-#: term-utils/agetty.c:423
+#: term-utils/agetty.c:434
 #, fuzzy, c-format
 msgid "%s: can't change root directory %s: %m"
 msgstr "%s：無法 exec %s: %m"
 
-#: term-utils/agetty.c:428
+#: term-utils/agetty.c:439
 #, fuzzy, c-format
 msgid "%s: can't change working directory %s: %m"
 msgstr "%s：無法 exec %s: %m"
 
-#: term-utils/agetty.c:433
+#: term-utils/agetty.c:444
 #, fuzzy, c-format
 msgid "%s: can't change process priority: %m"
 msgstr "%s：找不到進程「%s」\n"
 
-#: term-utils/agetty.c:439
+#: term-utils/agetty.c:450
 #, c-format
 msgid "%s: can't exec %s: %m"
 msgstr "%s：無法 exec %s: %m"
 
-#: term-utils/agetty.c:559
+#: term-utils/agetty.c:479 term-utils/agetty.c:729 term-utils/agetty.c:741
+#: term-utils/agetty.c:1502 term-utils/agetty.c:1858
+#, fuzzy, c-format
+msgid "failed to allocate memory: %m"
+msgstr "配置輸出緩衝區時失敗"
+
+#: term-utils/agetty.c:649
 #, c-format
 msgid "bad timeout value: %s"
 msgstr "不當的逾時設定值：%s"
 
-#: term-utils/agetty.c:587 term-utils/agetty.c:596
+#: term-utils/agetty.c:677 term-utils/agetty.c:686
 #, fuzzy
 msgid "not enough arguments"
 msgstr "引數不足"
 
-#: term-utils/agetty.c:639 term-utils/agetty.c:651 term-utils/agetty.c:1405
-#: term-utils/agetty.c:1761 term-utils/agetty.c:1861
-#, fuzzy, c-format
-msgid "failed to allocate memory: %m"
-msgstr "配置輸出緩衝區時失敗"
-
-#: term-utils/agetty.c:669
+#: term-utils/agetty.c:759
 #, c-format
 msgid "bad speed: %s"
 msgstr "不當的速度：%s"
 
-#: term-utils/agetty.c:671
+#: term-utils/agetty.c:761
 msgid "too many alternate speeds"
 msgstr "太多交替速度"
 
-#: term-utils/agetty.c:792 term-utils/agetty.c:809 term-utils/agetty.c:843
+#: term-utils/agetty.c:882 term-utils/agetty.c:899 term-utils/agetty.c:933
 #, c-format
 msgid "/dev/%s: cannot open as standard input: %m"
 msgstr "/dev/%s: 無法開啟為標準輸入：%m"
 
-#: term-utils/agetty.c:813 term-utils/agetty.c:817
+#: term-utils/agetty.c:903 term-utils/agetty.c:907
 #, c-format
 msgid "/dev/%s: not a character device"
 msgstr "/dev/%s: 不是字元裝置"
 
-#: term-utils/agetty.c:857
+#: term-utils/agetty.c:947
 #, c-format
 msgid "%s: not open for read/write"
 msgstr "%s：無法開啟用於讀取/寫入"
 
-#: term-utils/agetty.c:874
+#: term-utils/agetty.c:964
 #, c-format
 msgid "%s: dup problem: %m"
 msgstr "%s：dup 問題：%m"
 
-#: term-utils/agetty.c:1216
+#: term-utils/agetty.c:1313
 msgid "Num Lock off"
 msgstr ""
 
-#: term-utils/agetty.c:1219
+#: term-utils/agetty.c:1316
 msgid "Num Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1222
+#: term-utils/agetty.c:1319
 msgid "Caps Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1225
+#: term-utils/agetty.c:1322
 msgid "Scroll Lock on"
 msgstr ""
 
-#: term-utils/agetty.c:1228
+#: term-utils/agetty.c:1325
 #, fuzzy, c-format
 msgid ""
 "Hint: %s\n"
 "\n"
 msgstr "類型：%s\n"
 
-#: term-utils/agetty.c:1331
+#: term-utils/agetty.c:1428
 #, c-format
 msgid "%s: read: %m"
 msgstr "%s：讀取：%m"
 
-#: term-utils/agetty.c:1385
+#: term-utils/agetty.c:1482
 #, c-format
 msgid "%s: input overrun"
 msgstr "%s：輸入超出"
 
-#: term-utils/agetty.c:1535
+#: term-utils/agetty.c:1632
 #, c-format
 msgid ""
 "\n"
 "Usage:\n"
-"    %1$s [options] line baud_rate,... [termtype]\n"
-"    %1$s [options] baud_rate,... line [termtype]\n"
+" %1$s [options] line baud_rate,... [termtype]\n"
+" %1$s [options] baud_rate,... line [termtype]\n"
 msgstr ""
 
-#: term-utils/agetty.c:1540
+#: term-utils/agetty.c:1637
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 " -8, --8bits                assume 8-bit tty\n"
-" -a, --autologin USER       login the specified user automatically\n"
+" -a, --autologin <user>     login the specified user automatically\n"
 " -c, --noreset              do not reset control mode\n"
-" -f, --issue-file FILE      display issue file\n"
+" -f, --issue-file <file>    display issue file\n"
 " -h, --flow-control         enable hardware flow control\n"
-" -H, --host HOSTNAME        specify login host\n"
+" -H, --host <hostname>      specify login host\n"
 " -i, --noissue              do not display issue file\n"
-" -I, --init-string STRING   set init string\n"
-" -l, --login-program FILE   specify login program\n"
+" -I, --init-string <string> set init string\n"
+" -l, --login-program <file> specify login program\n"
 " -L, --local-line           force local line\n"
 " -m, --extract-baud         extract baud rate during connect\n"
 " -n, --skip-login           do not prompt for login\n"
-" -o, --login-options OPTS   options that are passed to login\n"
+" -o, --login-options <opts> options that are passed to login\n"
 " -p, --loginpause           wait for any key before the login\n"
 " -R, --hangup               do virtually hangup on the tty\n"
 " -s, --keep-baud            try to keep baud rate after break\n"
-" -t, --timeout NUMBER       login process timeout\n"
+" -t, --timeout <number>     login process timeout\n"
 " -U, --detect-case          detect uppercase terminal\n"
 " -w, --wait-cr              wait carriage-return\n"
 "     --noclear              do not clear the screen before prompt\n"
@@ -12706,72 +12789,66 @@ msgid ""
 "\n"
 msgstr ""
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "user"
 msgstr "使用者"
 
-#: term-utils/agetty.c:1745
+#: term-utils/agetty.c:1842
 #, c-format
 msgid "users"
 msgstr "使用者"
 
-#: term-utils/mesg.c:68
+#: term-utils/mesg.c:70
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [y | n]\n"
+msgid " %s [options] [y | n]\n"
 msgstr ""
 "\n"
 "用法：%s [選項]\n"
 "\n"
 
-#: term-utils/mesg.c:71
-#, c-format
+#: term-utils/mesg.c:73
 msgid ""
-"\n"
-"Options:\n"
-"  -v, --verbose      explain what is being done\n"
-"  -V, --version      output version information and exit\n"
-"  -h, --help         output help screen and exit\n"
+" -v, --verbose      explain what is being done\n"
+" -V, --version      output version information and exit\n"
+" -h, --help         output help screen and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/mesg.c:115
+#: term-utils/mesg.c:116
 #, fuzzy
 msgid "ttyname failed"
 msgstr "unshare 失敗"
 
-#: term-utils/mesg.c:118
+#: term-utils/mesg.c:119
 #, fuzzy, c-format
 msgid "stat %s failed"
 msgstr "狀態取得失敗：%s"
 
-#: term-utils/mesg.c:122
+#: term-utils/mesg.c:123
 #, fuzzy
 msgid "is y"
 msgstr "是 y\n"
 
-#: term-utils/mesg.c:125
+#: term-utils/mesg.c:126
 #, fuzzy
 msgid "is n"
 msgstr "是 n\n"
 
-#: term-utils/mesg.c:136 term-utils/mesg.c:142
+#: term-utils/mesg.c:137 term-utils/mesg.c:143
 #, fuzzy, c-format
 msgid "change %s mode failed"
 msgstr "建立號誌時失敗"
 
-#: term-utils/mesg.c:138
+#: term-utils/mesg.c:139
 msgid "write access to your terminal is allowed"
 msgstr ""
 
-#: term-utils/mesg.c:144
+#: term-utils/mesg.c:145
 msgid "write access to your terminal is denied"
 msgstr ""
 
-#: term-utils/mesg.c:147
+#: term-utils/mesg.c:148
 #, fuzzy, c-format
 msgid "invalid argument: %c"
 msgstr "無效的 iflag：%s"
@@ -12787,52 +12864,46 @@ msgstr ""
 "如果您真的要使用它就輸入「%s [options] %s」。\n"
 "命令稿並未啟動。\n"
 
-#: term-utils/script.c:131 text-utils/ul.c:135
+#: term-utils/script.c:132
 #, fuzzy, c-format
-msgid ""
-"\n"
-"Usage:\n"
-" %s [options] [file]\n"
+msgid " %s [options] [file]\n"
 msgstr "用法：%s [選項] 裝置…\n"
 
 #: term-utils/script.c:135
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-" -a, --append            append output\n"
-" -c, --command COMMAND   run command rather than interactive shell\n"
+" -a, --append            append the output\n"
+" -c, --command <command> run command rather than interactive shell\n"
 " -r, --return            return exit code of the child process\n"
 " -f, --flush             run flush after each write\n"
-"     --force             use output file even it would be a link\n"
+"     --force             use output file even when it is a link\n"
 " -q, --quiet             be quiet\n"
-" -t, --timing=FILE       output timing data to stderr, or to file\n"
+" -t, --timing[=<file>]   output timing data to stderr (or to FILE)\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/script.c:209 term-utils/scriptreplay.c:193
+#: term-utils/script.c:208 term-utils/scriptreplay.c:195
 #, c-format
 msgid "cannot open timing file %s"
 msgstr "無法開啟時序檔案 %s"
 
-#: term-utils/script.c:244
+#: term-utils/script.c:243
 #, c-format
 msgid "Script started, file is %s\n"
 msgstr "命令稿已啟動，檔案是 %s\n"
 
-#: term-utils/script.c:364
+#: term-utils/script.c:363
 #, c-format
 msgid "Script started on %s"
 msgstr "命令稿啟動於 %s"
 
-#: term-utils/script.c:400
+#: term-utils/script.c:399
 #, fuzzy
 msgid "cannot write script file"
 msgstr "%s：無法寫入命令稿檔案，錯誤：%s\n"
 
-#: term-utils/script.c:477
+#: term-utils/script.c:476
 #, c-format
 msgid ""
 "\n"
@@ -12841,79 +12912,76 @@ msgstr ""
 "\n"
 "命令稿已於 %s 完成"
 
-#: term-utils/script.c:486
+#: term-utils/script.c:485
 #, c-format
 msgid "Script done, file is %s\n"
 msgstr "命令稿已完成，檔案是 %s\n"
 
-#: term-utils/script.c:508
+#: term-utils/script.c:507
 #, fuzzy
 msgid "openpty failed"
 msgstr "openpty 失敗\n"
 
-#: term-utils/script.c:544
+#: term-utils/script.c:543
 #, fuzzy
 msgid "out of pty's"
 msgstr "pty 數量不足\n"
 
-#: term-utils/scriptreplay.c:39
+#: term-utils/scriptreplay.c:41
 #, fuzzy, c-format
-msgid "Usage: %s timingfile [typescript] [divisor]\n"
+msgid " %s [-t] timingfile [typescript] [divisor]\n"
 msgstr "%s <timingfile> [<typescript> [<divisor>]]\n"
 
-#: term-utils/scriptreplay.c:42
-#, c-format
+#: term-utils/scriptreplay.c:45
 msgid ""
-"\n"
-"Options:\n"
-" -t, --timing FILE       script timing output file\n"
-" -s, --typescript FILE   script terminal session output file\n"
-" -d, --divisor NUM       speed up or slow down execution with time divisor\n"
+" -t, --timing <file>     script timing output file\n"
+" -s, --typescript <file> script terminal session output file\n"
+" -d, --divisor <num>     speed up or slow down execution with time divisor\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/scriptreplay.c:62
+#: term-utils/scriptreplay.c:64
 #, c-format
 msgid "expected a number, but got '%s'"
 msgstr "預期一個數字，但是卻得到「%s」"
 
-#: term-utils/scriptreplay.c:65 term-utils/scriptreplay.c:69
+#: term-utils/scriptreplay.c:67 term-utils/scriptreplay.c:71
 #, c-format
 msgid "divisor '%s'"
 msgstr "除數「%s」"
 
-#: term-utils/scriptreplay.c:113
+#: term-utils/scriptreplay.c:115
 msgid "write to stdout failed"
 msgstr "寫入標準輸出時失敗"
 
-#: term-utils/scriptreplay.c:119
+#: term-utils/scriptreplay.c:121
 #, c-format
 msgid "unexpected end of file on %s"
 msgstr "未預期的檔案結束於 %s"
 
-#: term-utils/scriptreplay.c:121
+#: term-utils/scriptreplay.c:123
 #, c-format
 msgid "failed to read typescript file %s"
 msgstr "讀取 typescript 檔案 %s 時失敗"
 
-#: term-utils/scriptreplay.c:181
+#: term-utils/scriptreplay.c:183
 #, fuzzy
 msgid "wrong number of arguments"
 msgstr "未預期的引數數量"
 
-#: term-utils/scriptreplay.c:196
+#: term-utils/scriptreplay.c:198
 #, c-format
 msgid "cannot open typescript file %s"
 msgstr "無法開啟 typescript 檔案 %s"
 
-#: term-utils/scriptreplay.c:212
+#: term-utils/scriptreplay.c:214
 #, c-format
 msgid "failed to read timing file %s"
 msgstr "讀取時序檔案 %s 時失敗"
 
-#: term-utils/scriptreplay.c:214
+#: term-utils/scriptreplay.c:216
 #, c-format
 msgid "timings file %s: %lu: unexpected format"
 msgstr "時序檔案 %s：%lu：未預期的格式"
@@ -12924,50 +12992,47 @@ msgid "Argument error."
 msgstr "%s：引數錯誤，用法\n"
 
 #: term-utils/setterm.c:680
-#, c-format
 msgid ""
-"\n"
-"Options:\n"
-"  [ -term terminal_name ]\n"
-"  [ -reset ]\n"
-"  [ -initialize ]\n"
-"  [ -cursor [on|off] ]\n"
-"  [ -repeat [on|off] ]\n"
-"  [ -appcursorkeys [on|off] ]\n"
-"  [ -linewrap [on|off] ]\n"
-"  [ -default ]\n"
-"  [ -foreground black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -background black|blue|green|cyan|red|magenta|yellow|white|default ]\n"
-"  [ -ulcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -ulcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor black|grey|blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -hbcolor bright blue|green|cyan|red|magenta|yellow|white ]\n"
-"  [ -inversescreen [on|off] ]\n"
-"  [ -bold [on|off] ]\n"
-"  [ -half-bright [on|off] ]\n"
-"  [ -blink [on|off] ]\n"
-"  [ -reverse [on|off] ]\n"
-"  [ -underline [on|off] ]\n"
-"  [ -store ]\n"
-"  [ -clear [all|rest] ]\n"
-"  [ -tabs [ tab1 tab2 tab3 ... ] ]      (tabn = 1-160)\n"
-"  [ -clrtabs [ tab1 tab2 tab3 ... ] ]   (tabn = 1-160)\n"
-"  [ -regtabs [1-160] ]\n"
-"  [ -blank [0-60|force|poke] ]\n"
-"  [ -dump   [1-NR_CONSOLES] ]\n"
-"  [ -append [1-NR_CONSOLES] ]\n"
-"  [ -file dumpfilename ]\n"
-"  [ -msg [on|off] ]\n"
-"  [ -msglevel [0-8] ]\n"
-"  [ -powersave [on|vsync|hsync|powerdown|off] ]\n"
-"  [ -powerdown [0-60] ]\n"
-"  [ -blength [0-2000] ]\n"
-"  [ -bfreq freqnumber ]\n"
-"  [ -version ]\n"
-"  [ -help ]\n"
-msgstr ""
-
-#: term-utils/setterm.c:719
+" -term <terminal_name>\n"
+" -reset\n"
+" -initialize\n"
+" -cursor <on|off>\n"
+" -repeat <on|off>\n"
+" -appcursorkeys <on|off>\n"
+" -linewrap <on|off>\n"
+" -default\n"
+" -foreground <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -background <black|blue|green|cyan|red|magenta|yellow|white|default>\n"
+" -ulcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -ulcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <black|grey|blue|green|cyan|red|magenta|yellow|white>\n"
+" -hbcolor <bright blue|green|cyan|red|magenta|yellow|white>\n"
+" -inversescreen <on|off>\n"
+" -bold <on|off>\n"
+" -half-bright <on|off>\n"
+" -blink <on|off>\n"
+" -reverse <on|off>\n"
+" -underline <on|off>\n"
+" -store >\n"
+" -clear <all|rest>\n"
+" -tabs < tab1 tab2 tab3 ... >      (tabn = 1-160)\n"
+" -clrtabs < tab1 tab2 tab3 ... >   (tabn = 1-160)\n"
+" -regtabs <1-160>\n"
+" -blank <0-60|force|poke>\n"
+" -dump   <1-NR_CONSOLES>\n"
+" -append <1-NR_CONSOLES>\n"
+" -file dumpfilename\n"
+" -msg <on|off>\n"
+" -msglevel <0-8>\n"
+" -powersave <on|vsync|hsync|powerdown|off>\n"
+" -powerdown <0-60>\n"
+" -blength <0-2000>\n"
+" -bfreq freqnumber\n"
+" -version\n"
+" -help\n"
+msgstr ""
+
+#: term-utils/setterm.c:718
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -12976,61 +13041,61 @@ msgstr ""
 "\n"
 "要獲得更多資訊請參看 swaplabel(8)。\n"
 
-#: term-utils/setterm.c:1072
+#: term-utils/setterm.c:1071
 #, fuzzy
 msgid "cannot force blank"
 msgstr "無法強制空白\n"
 
-#: term-utils/setterm.c:1076
+#: term-utils/setterm.c:1075
 #, fuzzy
 msgid "cannot force unblank"
 msgstr "無法強制非空白\n"
 
-#: term-utils/setterm.c:1082
+#: term-utils/setterm.c:1081
 #, fuzzy
 msgid "cannot get blank status"
 msgstr "無法取得空白狀態\n"
 
-#: term-utils/setterm.c:1094
+#: term-utils/setterm.c:1093
 #, fuzzy
 msgid "cannot (un)set powersave mode"
 msgstr "無法(取消)設定省電模式\n"
 
-#: term-utils/setterm.c:1114
+#: term-utils/setterm.c:1113
 #, fuzzy, c-format
 msgid "can not open dump file %s for output"
 msgstr "無法開啟裝置 %s 以供寫入\n"
 
-#: term-utils/setterm.c:1130 term-utils/setterm.c:1138
+#: term-utils/setterm.c:1129 term-utils/setterm.c:1137
 #, fuzzy
 msgid "klogctl error"
 msgstr "klogctl 錯誤：%s\n"
 
-#: term-utils/setterm.c:1204
+#: term-utils/setterm.c:1203
 #, fuzzy
 msgid "Error writing screendump"
 msgstr "寫入螢幕傾印時發生錯誤\n"
 
-#: term-utils/setterm.c:1211
+#: term-utils/setterm.c:1210
 #, fuzzy, c-format
 msgid "Couldn't read %s"
 msgstr "無法讀取 %s\n"
 
-#: term-utils/setterm.c:1264
+#: term-utils/setterm.c:1263
 #, fuzzy
 msgid "$TERM is not defined."
 msgstr "%s：$TERM 並未定義。\n"
 
-#: term-utils/setterm.c:1272
+#: term-utils/setterm.c:1271
 msgid "terminfo database cannot be found"
 msgstr ""
 
-#: term-utils/setterm.c:1274
+#: term-utils/setterm.c:1273
 #, fuzzy, c-format
 msgid "%s: unknown terminal type"
 msgstr "%s：不明信號 %s\n"
 
-#: term-utils/setterm.c:1276
+#: term-utils/setterm.c:1275
 msgid "terminal is hardcopy"
 msgstr ""
 
@@ -13058,144 +13123,149 @@ msgstr "衍生：%s"
 msgid "%s: BAD ERROR, message is far too long"
 msgstr ""
 
-#: term-utils/wall.c:87
+#: term-utils/wall.c:89
 #, fuzzy, c-format
-msgid "Usage: %s [options] [file]\n"
+msgid " %s [options] [<file>]\n"
 msgstr "用法：%s [選項] 裝置…\n"
 
-#: term-utils/wall.c:90
-#, c-format
+#: term-utils/wall.c:92
 msgid ""
-"\n"
-"Options:\n"
 " -n, --nobanner          do not print banner, works only for root\n"
-" -t, --timeout TIMEOUT   write timeout in seconds\n"
+" -t, --timeout <timeout> write timeout in seconds\n"
 " -V, --version           output version information and exit\n"
 " -h, --help              display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/wall.c:130
+#: term-utils/wall.c:131
 msgid "--nobanner is available only for root"
 msgstr ""
 
-#: term-utils/wall.c:133
+#: term-utils/wall.c:134
 #, fuzzy
 msgid "invalid timeout argument"
 msgstr "無效的選項"
 
-#: term-utils/wall.c:135
+#: term-utils/wall.c:136
 #, fuzzy, c-format
 msgid "invalid timeout argument: %s"
 msgstr "不當的逾時設定值：%s"
 
-#: term-utils/wall.c:207
+#: term-utils/wall.c:208
 #, fuzzy, c-format
 msgid "can't open temporary file %s"
 msgstr "%s：無法開啟暫存檔。\n"
 
-#: term-utils/wall.c:216
+#: term-utils/wall.c:217
 #, fuzzy
 msgid "cannot get passwd uid"
 msgstr "無法設定使用者識別號"
 
-#: term-utils/wall.c:221
+#: term-utils/wall.c:222
 #, fuzzy
 msgid "cannot get tty name"
 msgstr "無法取得磁碟大小"
 
-#: term-utils/wall.c:237
+#: term-utils/wall.c:238
 #, c-format
 msgid "Broadcast Message from %s@%s"
 msgstr "廣播訊息來自 %s@%s"
 
-#: term-utils/wall.c:257
+#: term-utils/wall.c:258
 #, fuzzy, c-format
 msgid "will not read %s - use stdin."
 msgstr "%s：無法讀取 %s - 使用標準輸入。\n"
 
-#: term-utils/wall.c:283
+#: term-utils/wall.c:284
 #, fuzzy
 msgid "fstat failed"
 msgstr "%s：fstat 失敗"
 
-#: term-utils/wall.c:289
+#: term-utils/wall.c:290
 #, fuzzy
 msgid "fread failed"
 msgstr "讀取失敗：%s"
 
-#: term-utils/write.c:78
+#: term-utils/write.c:80
 #, fuzzy, c-format
-msgid "Usage: %s [options] user [ttyname]\n"
+msgid " %s [options] <user> [<ttyname>]\n"
 msgstr ""
 "\n"
 "用法：%s [選項] 路徑名稱 [路徑名稱...]\n"
 
-#: term-utils/write.c:81
-#, c-format
+#: term-utils/write.c:84
 msgid ""
-"\n"
-"Options:\n"
 " -V, --version    output version information and exit\n"
 " -h, --help       display this help and exit\n"
 "\n"
 msgstr ""
 
-#: term-utils/write.c:133
+#: term-utils/write.c:135
 #, fuzzy
 msgid "can't find your tty's name"
 msgstr "write：找不到您的 tty 名稱\n"
 
-#: term-utils/write.c:146
+#: term-utils/write.c:148
 #, fuzzy
-msgid "you have write permission turned off."
+msgid "you have write permission turned off"
 msgstr "write：您已關閉寫入權限。\n"
 
-#: term-utils/write.c:164
+#: term-utils/write.c:166
 #, fuzzy, c-format
-msgid "%s is not logged in on %s."
+msgid "%s is not logged in on %s"
 msgstr "write：%s 並未登入 %s。\n"
 
-#: term-utils/write.c:170
+#: term-utils/write.c:172
 #, fuzzy, c-format
 msgid "%s has messages disabled on %s"
 msgstr "write：%s 已於 %s 停用訊息\n"
 
-#: term-utils/write.c:265
+#: term-utils/write.c:267
 #, fuzzy, c-format
 msgid "%s is not logged in"
 msgstr "write：%s 並未登入\n"
 
-#: term-utils/write.c:272
+#: term-utils/write.c:274
 #, fuzzy, c-format
 msgid "%s has messages disabled"
 msgstr "write：%s 已停用訊息\n"
 
-#: term-utils/write.c:274
+#: term-utils/write.c:276
 #, fuzzy, c-format
 msgid "%s is logged in more than once; writing to %s"
 msgstr "write：%s 已登入一次以上；寫入 %s\n"
 
-#: term-utils/write.c:322
+#: term-utils/write.c:324
 #, fuzzy, c-format
 msgid "tty path %s too long"
 msgstr "輸入列太長。\n"
 
-#: term-utils/write.c:338
+#: term-utils/write.c:340
 #, c-format
 msgid "Message from %s@%s (as %s) on %s at %s ..."
 msgstr "訊息來自 %s@%s (身份為 %s) 於 %s 在 %s …"
 
-#: term-utils/write.c:341
+#: term-utils/write.c:343
 #, c-format
 msgid "Message from %s@%s on %s at %s ..."
 msgstr "訊息來自 %s@%s 於 %s 在 %s …"
 
-#: term-utils/write.c:368
+#: term-utils/write.c:370
 #, fuzzy
 msgid "carefulputc failed"
 msgstr "calloc 失敗"
 
+#: text-utils/col.c:120
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options]\n"
+msgstr ""
+"\n"
+"用法：%s [選項]\n"
+"\n"
+
 #: text-utils/col.c:124
 #, c-format
 msgid ""
@@ -13380,7 +13450,7 @@ msgid ""
 " -e format       format string to be used for displaying data\n"
 " -f format_file  file that contains format strings\n"
 " -n length       interpret only length bytes of input\n"
-" -s offset       skip offset bytes from the beginnin\n"
+" -s offset       skip offset bytes from the beginning\n"
 " -v              display without squeezing similar lines\n"
 " -V              output version information and exit\n"
 "\n"
@@ -13578,7 +13648,7 @@ msgstr ""
 "\n"
 "找不到相符的式樣\n"
 
-#: text-utils/more.c:1645 text-utils/pg.c:1115 text-utils/pg.c:1266
+#: text-utils/more.c:1645 text-utils/pg.c:1116 text-utils/pg.c:1267
 msgid "Pattern not found"
 msgstr "找不到相符的式樣"
 
@@ -13643,7 +13713,7 @@ msgstr "hexdump：不當的格式 {%s}\n"
 msgid "bad conversion character %%%s"
 msgstr "hexdump：不當的轉換字元 %%%s。\n"
 
-#: text-utils/pg.c:146
+#: text-utils/pg.c:147
 msgid ""
 "All rights reserved.\n"
 "-------------------------------------------------------\n"
@@ -13694,87 +13764,87 @@ msgstr ""
 "參看 pg(1) 以獲得更多資訊。\n"
 " -------------------------------------------------------\n"
 
-#: text-utils/pg.c:222
+#: text-utils/pg.c:223
 #, c-format
 msgid ""
 "%s: Usage: %s [-number] [-p string] [-cefnrs] [+line] [+/pattern/] [files]\n"
 msgstr "%s：用法：%s [-數字] [-p 字串] [-cefnrs] [+列] [+/式樣/] [多個檔案]\n"
 
-#: text-utils/pg.c:231
+#: text-utils/pg.c:232
 #, c-format
 msgid "%s: option requires an argument -- %s\n"
 msgstr "%s：選項需要一個引數 -- %s\n"
 
-#: text-utils/pg.c:239
+#: text-utils/pg.c:240
 #, c-format
 msgid "%s: illegal option -- %s\n"
 msgstr "%s：不合法的選項 -- %s\n"
 
-#: text-utils/pg.c:356
+#: text-utils/pg.c:357
 msgid "...skipping forward\n"
 msgstr "...向前跳過\n"
 
-#: text-utils/pg.c:358
+#: text-utils/pg.c:359
 msgid "...skipping backward\n"
 msgstr "...向後跳過\n"
 
-#: text-utils/pg.c:380
+#: text-utils/pg.c:381
 msgid "No next file"
 msgstr "沒有下個檔案"
 
-#: text-utils/pg.c:384
+#: text-utils/pg.c:385
 msgid "No previous file"
 msgstr "沒有上個檔案"
 
-#: text-utils/pg.c:919
+#: text-utils/pg.c:920
 #, c-format
 msgid "%s: Read error from %s file\n"
 msgstr "%s：從 %s 檔案讀取時錯誤\n"
 
-#: text-utils/pg.c:925
+#: text-utils/pg.c:926
 #, c-format
 msgid "%s: Unexpected EOF in %s file\n"
 msgstr "%s：在 %s 檔案中出現未預期的檔案結束\n"
 
-#: text-utils/pg.c:928
+#: text-utils/pg.c:929
 #, c-format
 msgid "%s: Unknown error in %s file\n"
 msgstr "%s：%s 檔案中發生不明錯誤\n"
 
-#: text-utils/pg.c:1023
+#: text-utils/pg.c:1024
 #, c-format
 msgid "%s: Cannot create tempfile\n"
 msgstr "%s：無法建立暫存檔\n"
 
-#: text-utils/pg.c:1032 text-utils/pg.c:1207 text-utils/pg.c:1234
+#: text-utils/pg.c:1033 text-utils/pg.c:1208 text-utils/pg.c:1235
 msgid "RE error: "
 msgstr "正規表示式錯誤："
 
-#: text-utils/pg.c:1189
+#: text-utils/pg.c:1190
 msgid "(EOF)"
 msgstr "(檔案結束)"
 
-#: text-utils/pg.c:1215 text-utils/pg.c:1242
+#: text-utils/pg.c:1216 text-utils/pg.c:1243
 msgid "No remembered search string"
 msgstr "沒有被記住的搜尋字串"
 
-#: text-utils/pg.c:1298
+#: text-utils/pg.c:1299
 msgid "Cannot open "
 msgstr "無法開啟 "
 
-#: text-utils/pg.c:1346
+#: text-utils/pg.c:1347
 msgid "saved"
 msgstr "已儲存"
 
-#: text-utils/pg.c:1453
+#: text-utils/pg.c:1454
 msgid ": !command not allowed in rflag mode.\n"
 msgstr "：!命令在 rflag 模式不允許。\n"
 
-#: text-utils/pg.c:1485
+#: text-utils/pg.c:1486
 msgid "fork() failed, try again later\n"
 msgstr "fork() 失敗，稍後再試\n"
 
-#: text-utils/pg.c:1693
+#: text-utils/pg.c:1694
 msgid "(Next file: "
 msgstr "(下個檔案："
 
@@ -13844,8 +13914,8 @@ msgstr "用法：%s [選項] 裝置…\n"
 msgid ""
 "\n"
 "Options:\n"
-" -n, --lines NUMBER  output the last N lines\n"
-" -NUMBER             same as -n NUMBER\n"
+" -n, --lines NUMBER  output the last NUMBER lines\n"
+" -NUMBER             same as `-n NUMBER'\n"
 " -V, --version       output version information and exit\n"
 " -h, --help          display this help and exit\n"
 "\n"
@@ -13861,39 +13931,207 @@ msgstr "剖析 %s %s 時失敗"
 msgid "no input file specified"
 msgstr "未指定任何檔名"
 
+#: text-utils/ul.c:135
+#, fuzzy, c-format
+msgid ""
+"\n"
+"Usage:\n"
+" %s [options] [file...]\n"
+msgstr "用法：%s [選項] 裝置…\n"
+
 #: text-utils/ul.c:139
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
-" -t, --terminal TERMINAL    overwrite TERM environment variable\n"
-" -i, --indicated            Underlining is indicated by a separate line\n"
+" -t, --terminal TERMINAL    override the TERM environment variable\n"
+" -i, --indicated            underlining is indicated via a separate line\n"
 " -V, --version              output version information and exit\n"
 " -h, --help                 display this help and exit\n"
 "\n"
 msgstr ""
 
-#: text-utils/ul.c:209
+#: text-utils/ul.c:208
 msgid "trouble reading terminfo"
 msgstr "讀取 terminfo 時出現問題"
 
-#: text-utils/ul.c:214
+#: text-utils/ul.c:213
 #, c-format
 msgid "terminal `%s' is not known, defaulting to `dumb'"
 msgstr ""
 
-#: text-utils/ul.c:313
+#: text-utils/ul.c:312
 #, fuzzy, c-format
 msgid "unknown escape sequence in input: %o, %o"
 msgstr "不明的退出序列於輸入：%o, %o\n"
 
-#: text-utils/ul.c:650
+#: text-utils/ul.c:649
 #, fuzzy
 msgid "Input line too long."
 msgstr "輸入列太長。\n"
 
-#~ msgid "Usage:\n"
-#~ msgstr "用法:\n"
+#, fuzzy
+#~ msgid "closing file %s"
+#~ msgstr ""
+#~ "\n"
+#~ "關閉檔案發生錯誤\n"
+
+#~ msgid "Sorry You may change the Tag of non-empty partitions.\n"
+#~ msgstr "抱歉，您也許變更了非空白分割區的標記。\n"
+
+#~ msgid "Warning: partition %s "
+#~ msgstr "警告：分割區 %s "
+
+#~ msgid "Warning: partitions %s "
+#~ msgstr "警告：分割區 %s "
+
+#~ msgid "and %s overlap\n"
+#~ msgstr "和 %s 重疊\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ "  %s [options] device [...]\n"
+#~ msgstr "用法：%s [選項] 裝置…\n"
+
+#, fuzzy
+#~ msgid "Device is something like /dev/hda or /dev/sda\n"
+#~ msgstr "裝置：諸如 /dev/hda 或 /dev/sda"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Options:\n"
+#~ " -s, --fstab            search in static table of filesystems\n"
+#~ " -m, --mtab             search in table of mounted filesystems\n"
+#~ " -k, --kernel           search in kernel table of mounted \n"
+#~ "                        filesystems (default)\n"
+#~ "\n"
+#~ " -p, --poll[=<list>]    monitor changes in table of mounted filesystems\n"
+#~ " -w, --timeout <num>    upper limit in millisecods which --poll will "
+#~ "block\n"
+#~ "\n"
+#~ " -c, --canonicalize     canonicalize printed paths\n"
+#~ " -d, --direction <word> search direction - 'forward' or 'backward'\n"
+#~ " -e, --evaluate         print all TAGs (LABEL/UUID) evaluated\n"
+#~ " -f, --first-only       print the first found filesystem only\n"
+#~ " -h, --help             print this help\n"
+#~ " -i, --invert           invert sense of matching\n"
+#~ " -l, --list             use list format output\n"
+#~ " -n, --noheadings       don't print headings\n"
+#~ " -u, --notruncate       don't truncate text in columns\n"
+#~ " -O, --options <list>   limit the set of filesystems by mount options\n"
+#~ " -o, --output <list>    output columns\n"
+#~ " -P, --pairs            use key=\"value\" output format\n"
+#~ " -r, --raw              use raw output format\n"
+#~ " -a, --ascii            use ascii chars for tree formatting\n"
+#~ " -t, --types <list>     limit the set of filesystem by FS types\n"
+#~ " -v, --nofsroot         don't print [/dir] for bind or btrfs mounts\n"
+#~ " -R, --submounts        print all submount for the matching filesystems\n"
+#~ " -S, --source <string>  device, LABEL= or UUID=device\n"
+#~ " -T, --target <string>  mountpoint\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "選項：\n"
+#~ " -s, --fstab            在檔案系統的靜態表格中搜尋\n"
+#~ " -m, --mtab             在掛載檔案系統的表格中搜尋\n"
+#~ " -k, --kernel           在掛載檔案系統的內核表格中\n"
+#~ "                        搜尋 (預設)\n"
+#~ "\n"
+#~ " -c, --canonicalize     正則化印出路徑\n"
+#~ " -d, --direction <word> 搜尋方向 - 'forward' 或 'backward'\n"
+#~ " -e, --evaluate         印出所有已求值標記 (LABEL/UUID)\n"
+#~ " -f, --first-only       只印出第一個找到的檔案系統\n"
+#~ " -h, --help             印出這個說明\n"
+#~ " -i, --invert           反向符合方式\n"
+#~ " -l, --list             使用清單格式輸出\n"
+#~ " -n, --noheadings       不列印標頭\n"
+#~ " -u, --notruncate       不截斷直欄中的文字\n"
+#~ " -O, --options <list>   依掛載選項限制檔案系統集合\n"
+#~ " -o, --output <list>    輸出直欄\n"
+#~ " -r, --raw              使用原始格式輸出\n"
+#~ " -a, --ascii            使用 ascii 字元於樹狀格式化\n"
+#~ " -t, --types <list>     依檔案系統類型限制檔案系統集合\n"
+#~ " -S, --source <string>  裝置、LABEL= 或 UUID=裝置\n"
+#~ " -T, --target <string>  掛載點\n"
+#~ "\n"
+
+#~ msgid "%zd bytes ["
+#~ msgstr "%zd 位元組 ["
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-e] [-v] [-f]             enable all swaps from /etc/fstab\n"
+#~ " %1$s [-p priority] [-d] [-v] [-f] <special>  enable given swap\n"
+#~ " %1$s -s                            display swap usage summary\n"
+#~ " %1$s -h                            display help\n"
+#~ " %1$s -V                            display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "用法：\n"
+#~ " %1$s -a [-e] [-v] [-f]             從 /etc/fstab 啟用全部交換區\n"
+#~ " %1$s [-p 優先權] [-v] [-f] <special> 啟用給定交換區\n"
+#~ " %1$s -s                            顯示交換區用法概要\n"
+#~ " %1$s -h                            顯示說明\n"
+#~ " %1$s -V                            顯示版本\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %1$s -a [-v]                      disable all swaps\n"
+#~ " %1$s [-v] <special>               disable given swap\n"
+#~ " %1$s -h                           display help\n"
+#~ " %1$s -V                           display version\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "用法：\n"
+#~ " %1$s -a [-v]                      停用所有交換區\n"
+#~ " %1$s [-v] <special>               停用給定的交換區\n"
+#~ " %1$s -h                           顯示說明\n"
+#~ " %1$s -V                           顯示版本\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "Usage: %s [options] <filename>\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "用法：%s [選項] <檔案名稱>\n"
+#~ "\n"
+#~ "選項：\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "用法：%s [選項]\n"
+#~ "\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "Usage: %s [options]\n"
+#~ "\n"
+#~ "Options:\n"
+#~ msgstr ""
+#~ "用法：%s [選項] <裝置>\n"
+#~ "\n"
+#~ "選項：\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "\n"
+#~ "Usage:\n"
+#~ " %s [options] [file]\n"
+#~ msgstr "用法：%s [選項] 裝置…\n"
 
 #~ msgid "  %s -V\n"
 #~ msgstr "  %s -V\n"
@@ -14025,25 +14263,10 @@ msgstr "輸入列太長。\n"
 #~ msgid "    -? [or --help]:      print this message"
 #~ msgstr "    -? [或 --help]：     印出這個訊息"
 
-#~ msgid "dangerous options:"
-#~ msgstr "危險選項："
-
 #~ msgid "    -g [or --show-geometry]: print the kernel's idea of the geometry"
 #~ msgstr "    -g [或 --show-geometry]：印出內核對於硬碟結構參數的認知"
 
 #~ msgid ""
-#~ "    -G [or --show-pt-geometry]: print geometry guessed from the partition "
-#~ "table"
-#~ msgstr "    -G [或 --show-pt-geometry]：印出根據分割表所猜測的硬碟結構參數"
-
-#~ msgid ""
-#~ "    -x [or --show-extended]: also list extended partitions on output\n"
-#~ "                             or expect descriptors for them on input"
-#~ msgstr ""
-#~ "    -x [或 --show-extended]：於輸出時也列出擴充分割區\n"
-#~ "                            或預期輸入時有對於它們的描述"
-
-#~ msgid ""
 #~ "    -L  [or --Linux]:      do not complain about things irrelevant for "
 #~ "Linux"
 #~ msgstr "    -L  [或 --Linux]：     不抱怨對於 Linux 而言並不重要的東西"
@@ -14097,48 +14320,9 @@ msgstr "輸入列太長。\n"
 #~ msgid "       getopt [options] [--] optstring parameters\n"
 #~ msgstr "       getopt [選項] [--] 選項字串 參數\n"
 
-#~ msgid "       getopt [options] -o|--options optstring [options] [--]\n"
-#~ msgstr "       getopt [選項] -o|--options 選項字串 [選項] [--]\n"
-
 #~ msgid "              parameters\n"
 #~ msgstr "              參數\n"
 
-#~ msgid ""
-#~ "  -a, --alternative            Allow long options starting with single -\n"
-#~ msgstr "  -a, --alternative            允許長選項以單一 - 開始\n"
-
-#~ msgid "  -h, --help                   This small usage guide\n"
-#~ msgstr "  -h, --help                   這份簡單用法說明\n"
-
-#~ msgid "  -l, --longoptions=longopts   Long options to be recognized\n"
-#~ msgstr "  -l, --longoptions=長選項     做為辨識的長選項\n"
-
-#~ msgid ""
-#~ "  -n, --name=progname          The name under which errors are reported\n"
-#~ msgstr "  -n, --name=程式名稱          錯誤報告時所用的名稱\n"
-
-#~ msgid "  -o, --options=optstring      Short options to be recognized\n"
-#~ msgstr "  -o, --options=選項字串       做為辨識的短選項\n"
-
-#~ msgid ""
-#~ "  -q, --quiet                  Disable error reporting by getopt(3)\n"
-#~ msgstr "  -q, --quiet                  停用 getopt(3) 發出的錯誤報告\n"
-
-#~ msgid "  -Q, --quiet-output           No normal output\n"
-#~ msgstr "  -Q, --quiet-output           沒有一般的輸出\n"
-
-#~ msgid "  -s, --shell=shell            Set shell quoting conventions\n"
-#~ msgstr "  -s, --shell=命令殼            設定命令殼引號慣例\n"
-
-#~ msgid "  -T, --test                   Test for getopt(1) version\n"
-#~ msgstr "  -T, --test                   測試 getopt(1) 的版本\n"
-
-#~ msgid "  -u, --unqote                 Do not quote the output\n"
-#~ msgstr "  -u, --unqote                 輸出不加上引號\n"
-
-#~ msgid "  -V, --version                Output version information\n"
-#~ msgstr "  -V, --version                輸出版本資訊\n"
-
 #~ msgid "getopt (enhanced) 1.1.4\n"
 #~ msgstr "getopt (進階版) 1.1.4\n"