Update for e2fsprogs 1.42-WIP-1120 release

4 files changed, 302 insertions, 253 deletions

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index afc738f6..98436bed 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,4 +1,4 @@
-E2fsprogs 1.42-WIP (October 16, 2011) -- c2c2b959bd87
+E2fsprogs 1.42-WIP (November 20, 2011) -- f62516f33b
 =======================================
 
 This release of e2fsprogs has support for file systems > 16TB.  Online
@@ -66,6 +66,9 @@ E2fsck will check for the bad block inode to make sure it looks sane
 before trusting it, to avoid causing more harm than good to the file
 system.
 
+E2fsck now returns additional status bits in its exit code if it
+aborts early in the e2fsck run.
+
 The mke2fs and e2fsck programs now tries to use the punch hole command
 as a "discard" when operating on normal files.
 
@@ -136,6 +139,18 @@ searched-for block as an extended attribute block.
 Debugfs now has a new "punch" command which remove blocks from the
 middle of an inode.
 
+Debugfs now has a new "e2freefrag" command which analyzes the free
+space fragmentation of the file system, using the same code as the
+e2freefrag program.
+
+Debugfs now has a "filefrag" command which displays information about
+a file's fragmentation.
+
+Add support to build a metadata-only, read-only, stripped-down version
+of debugfs called rdebugfs.
+
+Fixed a potential stack overrun bug in debugfs.
+
 The badblocks program now correctly recovers from I/O errors when
 direct I/O is being used.  The badblocks command now also supports a
 -B option which forces the use of buffered I/O, and the -v option will
@@ -170,6 +185,9 @@ physical extents for very large files.  (Addresses Debian Bug:
 Logsave's usage message has been fixed.  (Addresses Debian Bug:
 #619788)
 
+Avoid an infinite loop in ext2fs_find_block_device() if there are
+symlink loops in /dev caused by a buggy udev.
+
 Added a useful "fallocate" program to the contrib directory.
 
 Fixed an ABI compatibility problem in libext2fs which broke the dump
@@ -260,6 +278,8 @@ out of date.  This helps out Debian packaging.
 Allow ext2fs_get_memalign() to compile on systems that don't have
 posix_memalign().
 
+Fixed a namespace leak in libext2fs (tdb_null).
+
 
 E2fsprogs 1.41.14 (December 22, 2010)
 =====================================
diff --git a/debian/changelog b/debian/changelog
index d88ee3c9..ba7f2d42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,26 @@
+e2fsprogs (1.42~WIP-2011-11-20-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix error checking so resize2fs works when using a 32-bit userspace
+    and a 64-bit kernel (Closes: #644989)
+  * e2fsck now returns additional status bits in its exit code if it
+    aborts early in the e2fsck run
+  * Fix potential stack overflow in debugfs
+  * Avoid an infinite loop in ext2fs_find_block_device() if there are
+    symlink loops in /dev caused by a buggy udev
+  * Fix test failures on big-endian systems
+  * Fix gcc -Wall complaints
+  * Add freefrag and e2freefrag commands to debugfs
+  * Add a read-only, metadata-only debugfs command called rdebugfs
+  * Improve first-class quota support
+  * Fix bigalloc support in e2freefrag
+  * Clean up mmp handling
+  * Fix a regression which caused mke2fs to not work correctly on files
+    > 2GB.  (Closes: #647245)
+  * Fix a namespace leak in libext2fs (tdb_null)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Sun, 20 Nov 2011 21:32:49 -0500
+
 e2fsprogs (1.42~WIP-2011-10-16-1) unstable; urgency=low
 
   * New upstream release
diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index 732779ec..6b2726fd 100644
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -68,7 +68,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e2fsprogs 1.42-WIP\n"
 "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
-"POT-Creation-Date: 2011-10-09 20:32-0400\n"
+"POT-Creation-Date: 2011-11-20 21:24-0500\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"
@@ -77,7 +77,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: e2fsck/badblocks.c:23 misc/mke2fs.c:176
+#: e2fsck/badblocks.c:23 misc/mke2fs.c:177
 #, c-format
 msgid "Bad block %u out of range; ignored.\n"
 msgstr ""
@@ -94,7 +94,7 @@ msgstr ""
 #: e2fsck/unix.c:1239 e2fsck/unix.c:1324 misc/badblocks.c:1215
 #: misc/badblocks.c:1223 misc/badblocks.c:1237 misc/badblocks.c:1249
 #: misc/dumpe2fs.c:572 misc/e2image.c:1170 misc/e2image.c:1288
-#: misc/e2image.c:1301 misc/mke2fs.c:192 misc/tune2fs.c:1894 resize/main.c:308
+#: misc/e2image.c:1301 misc/mke2fs.c:193 misc/tune2fs.c:1907 resize/main.c:308
 #, c-format
 msgid "while trying to open %s"
 msgstr ""
@@ -104,7 +104,7 @@ msgstr ""
 msgid "while trying popen '%s'"
 msgstr ""
 
-#: e2fsck/badblocks.c:94 misc/mke2fs.c:199
+#: e2fsck/badblocks.c:94 misc/mke2fs.c:200
 msgid "while reading in list of bad blocks from file"
 msgstr ""
 
@@ -524,40 +524,40 @@ msgstr ""
 msgid "reading indirect blocks of inode %u"
 msgstr ""
 
-#: e2fsck/pass1.c:1330
+#: e2fsck/pass1.c:1335
 msgid "bad inode map"
 msgstr ""
 
-#: e2fsck/pass1.c:1352
+#: e2fsck/pass1.c:1357
 msgid "inode in bad block map"
 msgstr ""
 
-#: e2fsck/pass1.c:1372
+#: e2fsck/pass1.c:1377
 msgid "imagic inode map"
 msgstr ""
 
-#: e2fsck/pass1.c:1399
+#: e2fsck/pass1.c:1404
 msgid "multiply claimed block map"
 msgstr ""
 
-#: e2fsck/pass1.c:1499
+#: e2fsck/pass1.c:1504
 msgid "ext attr block map"
 msgstr ""
 
-#: e2fsck/pass1.c:2247
+#: e2fsck/pass1.c:2252
 #, c-format
 msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n"
 msgstr ""
 
-#: e2fsck/pass1.c:2608
+#: e2fsck/pass1.c:2613
 msgid "block bitmap"
 msgstr ""
 
-#: e2fsck/pass1.c:2614
+#: e2fsck/pass1.c:2619
 msgid "inode bitmap"
 msgstr ""
 
-#: e2fsck/pass1.c:2620
+#: e2fsck/pass1.c:2625
 msgid "inode table"
 msgstr ""
 
@@ -2440,7 +2440,7 @@ msgstr ""
 msgid "while calling ext2fs_block_iterate for inode %d"
 msgstr ""
 
-#: e2fsck/super.c:209
+#: e2fsck/super.c:210
 #, c-format
 msgid "while calling ext2fs_adjust_ea_refcount2 for inode %d"
 msgstr ""
@@ -2621,7 +2621,7 @@ msgid_plural "%8u files\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: e2fsck/unix.c:209 misc/badblocks.c:984 misc/tune2fs.c:1965 misc/util.c:147
+#: e2fsck/unix.c:209 misc/badblocks.c:984 misc/tune2fs.c:1978 misc/util.c:147
 #: resize/main.c:251
 #, c-format
 msgid "while determining whether %s is mounted."
@@ -2750,8 +2750,8 @@ msgstr ""
 msgid "The -t option is not supported on this version of e2fsck.\n"
 msgstr ""
 
-#: e2fsck/unix.c:814 e2fsck/unix.c:886 misc/tune2fs.c:799 misc/tune2fs.c:1088
-#: misc/tune2fs.c:1106
+#: e2fsck/unix.c:814 e2fsck/unix.c:886 misc/tune2fs.c:811 misc/tune2fs.c:1100
+#: misc/tune2fs.c:1118
 #, c-format
 msgid "Unable to resolve '%s'"
 msgstr ""
@@ -2792,7 +2792,7 @@ msgstr ""
 msgid "while checking MMP block"
 msgstr ""
 
-#: e2fsck/unix.c:1081 misc/tune2fs.c:1899
+#: e2fsck/unix.c:1081 misc/tune2fs.c:1912
 msgid ""
 "If you are sure the filesystem is not in use on any node, run:\n"
 "'tune2fs -f -E clear_mmp {device}'\n"
@@ -2934,7 +2934,7 @@ msgstr ""
 msgid "Creating journal (%d blocks): "
 msgstr ""
 
-#: e2fsck/unix.c:1553 misc/mke2fs.c:2514
+#: e2fsck/unix.c:1553 misc/mke2fs.c:2535
 msgid ""
 "\n"
 "\twhile trying to create journal"
@@ -2970,7 +2970,7 @@ msgstr ""
 msgid "aborted"
 msgstr ""
 
-#: e2fsck/unix.c:1597
+#: e2fsck/unix.c:1597 e2fsck/util.c:66
 #, c-format
 msgid ""
 "\n"
@@ -2982,7 +2982,7 @@ msgstr ""
 msgid "%s: ***** REBOOT LINUX *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1608
+#: e2fsck/unix.c:1608 e2fsck/util.c:72
 #, c-format
 msgid ""
 "\n"
@@ -2994,84 +2994,84 @@ msgstr ""
 msgid "while setting block group checksum info"
 msgstr ""
 
-#: e2fsck/util.c:141 misc/util.c:70
+#: e2fsck/util.c:160 misc/util.c:70
 msgid "yY"
 msgstr ""
 
-#: e2fsck/util.c:142
+#: e2fsck/util.c:161
 msgid "nN"
 msgstr ""
 
-#: e2fsck/util.c:156
+#: e2fsck/util.c:175
 msgid "<y>"
 msgstr ""
 
-#: e2fsck/util.c:158
+#: e2fsck/util.c:177
 msgid "<n>"
 msgstr ""
 
-#: e2fsck/util.c:160
+#: e2fsck/util.c:179
 msgid " (y/n)"
 msgstr ""
 
-#: e2fsck/util.c:175
+#: e2fsck/util.c:194
 msgid "cancelled!\n"
 msgstr ""
 
-#: e2fsck/util.c:190
+#: e2fsck/util.c:209
 msgid "yes\n"
 msgstr ""
 
-#: e2fsck/util.c:192
+#: e2fsck/util.c:211
 msgid "no\n"
 msgstr ""
 
-#: e2fsck/util.c:202
+#: e2fsck/util.c:221
 #, c-format
 msgid ""
 "%s? no\n"
 "\n"
 msgstr ""
 
-#: e2fsck/util.c:206
+#: e2fsck/util.c:225
 #, c-format
 msgid ""
 "%s? yes\n"
 "\n"
 msgstr ""
 
-#: e2fsck/util.c:210
+#: e2fsck/util.c:229
 msgid "yes"
 msgstr ""
 
-#: e2fsck/util.c:210
+#: e2fsck/util.c:229
 msgid "no"
 msgstr ""
 
-#: e2fsck/util.c:224
+#: e2fsck/util.c:243
 #, c-format
 msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
 msgstr ""
 
-#: e2fsck/util.c:229
+#: e2fsck/util.c:248
 msgid "reading inode and block bitmaps"
 msgstr ""
 
-#: e2fsck/util.c:234
+#: e2fsck/util.c:253
 #, c-format
 msgid "while retrying to read bitmaps for %s"
 msgstr ""
 
-#: e2fsck/util.c:246
+#: e2fsck/util.c:265
 msgid "writing block and inode bitmaps"
 msgstr ""
 
-#: e2fsck/util.c:251
+#: e2fsck/util.c:270
 #, c-format
 msgid "while rewriting block and inode bitmaps for %s"
 msgstr ""
 
-#: e2fsck/util.c:263
+#: e2fsck/util.c:282
 #, c-format
 msgid ""
 "\n"
@@ -3080,41 +3080,41 @@ msgid ""
 "\t(i.e., without -a or -p options)\n"
 msgstr ""
 
-#: e2fsck/util.c:344
+#: e2fsck/util.c:363
 #, c-format
 msgid "Memory used: %luk/%luk (%luk/%luk), "
 msgstr ""
 
-#: e2fsck/util.c:348
+#: e2fsck/util.c:367
 #, c-format
 msgid "Memory used: %lu, "
 msgstr ""
 
-#: e2fsck/util.c:355
+#: e2fsck/util.c:374
 #, c-format
 msgid "time: %5.2f/%5.2f/%5.2f\n"
 msgstr ""
 
-#: e2fsck/util.c:360
+#: e2fsck/util.c:379
 #, c-format
 msgid "elapsed time: %6.3f\n"
 msgstr ""
 
-#: e2fsck/util.c:394 e2fsck/util.c:408
+#: e2fsck/util.c:413 e2fsck/util.c:427
 #, c-format
 msgid "while reading inode %lu in %s"
 msgstr ""
 
-#: e2fsck/util.c:422 e2fsck/util.c:435
+#: e2fsck/util.c:441 e2fsck/util.c:454
 #, c-format
 msgid "while writing inode %lu in %s"
 msgstr ""
 
-#: e2fsck/util.c:584
+#: e2fsck/util.c:603
 msgid "while allocating zeroizing buffer"
 msgstr ""
 
-#: e2fsck/util.c:736
+#: e2fsck/util.c:755
 msgid ""
 "UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is "
 "running.\n"
@@ -3509,7 +3509,7 @@ msgstr ""
 msgid "Journal users:            %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:426 misc/mke2fs.c:662 misc/tune2fs.c:1125
+#: misc/dumpe2fs.c:426 misc/mke2fs.c:663 misc/tune2fs.c:1137
 #, c-format
 msgid "Couldn't allocate memory to parse options!\n"
 msgstr ""
@@ -3538,12 +3538,12 @@ msgid ""
 "\tblocksize=<blocksize>\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:538 misc/mke2fs.c:1499
+#: misc/dumpe2fs.c:538 misc/mke2fs.c:1521
 #, c-format
 msgid "\tUsing %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:574 misc/e2image.c:1290 misc/tune2fs.c:1910
+#: misc/dumpe2fs.c:574 misc/e2image.c:1290 misc/tune2fs.c:1923
 #: resize/main.c:310
 #, c-format
 msgid "Couldn't find valid filesystem superblock.\n"
@@ -3611,7 +3611,7 @@ msgstr ""
 msgid "e2label: not an ext2 filesystem\n"
 msgstr ""
 
-#: misc/e2label.c:97 misc/tune2fs.c:2060
+#: misc/e2label.c:97 misc/tune2fs.c:2073
 #, c-format
 msgid "Warning: label too long, truncating.\n"
 msgstr ""
@@ -3626,7 +3626,7 @@ msgstr ""
 msgid "e2label: error writing superblock\n"
 msgstr ""
 
-#: misc/e2label.c:117 misc/tune2fs.c:791
+#: misc/e2label.c:117 misc/tune2fs.c:803
 #, c-format
 msgid "Usage: e2label device [newlabel]\n"
 msgstr ""
@@ -3792,7 +3792,7 @@ msgstr ""
 msgid "While reading version on %s"
 msgstr ""
 
-#: misc/mke2fs.c:115
+#: misc/mke2fs.c:116
 #, c-format
 msgid ""
 "Usage: %s [-c|-l filename] [-b block-size] [-C cluster-size]\n"
@@ -3804,35 +3804,35 @@ msgid ""
 "\t[-T fs-type] [-U UUID] [-jnqvFKSV] device [blocks-count]\n"
 msgstr ""
 
-#: misc/mke2fs.c:217
+#: misc/mke2fs.c:218
 #, c-format
 msgid "Running command: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:221
+#: misc/mke2fs.c:222
 #, c-format
 msgid "while trying to run '%s'"
 msgstr ""
 
-#: misc/mke2fs.c:228
+#: misc/mke2fs.c:229
 msgid "while processing list of bad blocks from program"
 msgstr ""
 
-#: misc/mke2fs.c:255
+#: misc/mke2fs.c:256
 #, c-format
 msgid "Block %d in primary superblock/group descriptor area bad.\n"
 msgstr ""
 
-#: misc/mke2fs.c:257
+#: misc/mke2fs.c:258
 #, c-format
 msgid "Blocks %u through %u must be good in order to build a filesystem.\n"
 msgstr ""
 
-#: misc/mke2fs.c:260
+#: misc/mke2fs.c:261
 msgid "Aborting....\n"
 msgstr ""
 
-#: misc/mke2fs.c:280
+#: misc/mke2fs.c:281
 #, c-format
 msgid ""
 "Warning: the backup superblock/group descriptors at block %u contain\n"
@@ -3840,204 +3840,209 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:299
+#: misc/mke2fs.c:300
 msgid "while marking bad blocks as used"
 msgstr ""
 
-#: misc/mke2fs.c:316
+#: misc/mke2fs.c:317
 msgid "Writing inode tables: "
 msgstr ""
 
-#: misc/mke2fs.c:337
+#: misc/mke2fs.c:338
 #, c-format
 msgid ""
 "\n"
 "Could not write %d blocks in inode table starting at %llu: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:351 misc/mke2fs.c:2148 misc/mke2fs.c:2401
+#: misc/mke2fs.c:352 misc/mke2fs.c:2170 misc/mke2fs.c:2422
 #, c-format
 msgid "done                            \n"
 msgstr ""
 
-#: misc/mke2fs.c:362
+#: misc/mke2fs.c:363
 msgid "while creating root dir"
 msgstr ""
 
-#: misc/mke2fs.c:369
+#: misc/mke2fs.c:370
 msgid "while reading root inode"
 msgstr ""
 
-#: misc/mke2fs.c:383
+#: misc/mke2fs.c:384
 msgid "while setting root inode ownership"
 msgstr ""
 
-#: misc/mke2fs.c:401
+#: misc/mke2fs.c:402
 msgid "while creating /lost+found"
 msgstr ""
 
-#: misc/mke2fs.c:408
+#: misc/mke2fs.c:409
 msgid "while looking up /lost+found"
 msgstr ""
 
-#: misc/mke2fs.c:421
+#: misc/mke2fs.c:422
 msgid "while expanding /lost+found"
 msgstr ""
 
-#: misc/mke2fs.c:436
+#: misc/mke2fs.c:437
 msgid "while setting bad block inode"
 msgstr ""
 
-#: misc/mke2fs.c:463
+#: misc/mke2fs.c:464
 #, c-format
 msgid "Out of memory erasing sectors %d-%d\n"
 msgstr ""
 
-#: misc/mke2fs.c:473
+#: misc/mke2fs.c:474
 #, c-format
 msgid "Warning: could not read block 0: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:489
+#: misc/mke2fs.c:490
 #, c-format
 msgid "Warning: could not erase sector %d: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:505
+#: misc/mke2fs.c:506
 msgid "while initializing journal superblock"
 msgstr ""
 
-#: misc/mke2fs.c:513
+#: misc/mke2fs.c:514
 msgid "Zeroing journal device: "
 msgstr ""
 
-#: misc/mke2fs.c:525
+#: misc/mke2fs.c:526
 #, c-format
 msgid "while zeroing journal device (block %llu, count %d)"
 msgstr ""
 
-#: misc/mke2fs.c:543
+#: misc/mke2fs.c:544
 msgid "while writing journal superblock"
 msgstr ""
 
-#: misc/mke2fs.c:558
+#: misc/mke2fs.c:559
 #, c-format
 msgid ""
 "warning: %llu blocks unused.\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:563
+#: misc/mke2fs.c:564
 #, c-format
 msgid "Filesystem label=%s\n"
 msgstr ""
 
-#: misc/mke2fs.c:566
+#: misc/mke2fs.c:567
 #, c-format
 msgid "OS type: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:568
+#: misc/mke2fs.c:569
 #, c-format
 msgid "Block size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:572
+#: misc/mke2fs.c:573
 #, c-format
 msgid "Cluster size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:576
+#: misc/mke2fs.c:577
 #, c-format
 msgid "Fragment size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:578
+#: misc/mke2fs.c:579
 #, c-format
 msgid "Stride=%u blocks, Stripe width=%u blocks\n"
 msgstr ""
 
-#: misc/mke2fs.c:580
+#: misc/mke2fs.c:581
 #, c-format
 msgid "%u inodes, %llu blocks\n"
 msgstr ""
 
-#: misc/mke2fs.c:582
+#: misc/mke2fs.c:583
 #, c-format
 msgid "%llu blocks (%2.2f%%) reserved for the super user\n"
 msgstr ""
 
-#: misc/mke2fs.c:585
+#: misc/mke2fs.c:586
 #, c-format
 msgid "First data block=%u\n"
 msgstr ""
 
-#: misc/mke2fs.c:587
+#: misc/mke2fs.c:588
 #, c-format
 msgid "Maximum filesystem blocks=%lu\n"
 msgstr ""
 
-#: misc/mke2fs.c:591
+#: misc/mke2fs.c:592
 #, c-format
 msgid "%u block groups\n"
 msgstr ""
 
-#: misc/mke2fs.c:593
+#: misc/mke2fs.c:594
 #, c-format
 msgid "%u block group\n"
 msgstr ""
 
-#: misc/mke2fs.c:596
+#: misc/mke2fs.c:597
 #, c-format
 msgid "%u blocks per group, %u clusters per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:599
+#: misc/mke2fs.c:600
 #, c-format
 msgid "%u blocks per group, %u fragments per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:601
+#: misc/mke2fs.c:602
 #, c-format
 msgid "%u inodes per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:608
+#: misc/mke2fs.c:609
 #, c-format
 msgid "Superblock backups stored on blocks: "
 msgstr ""
 
-#: misc/mke2fs.c:687 misc/tune2fs.c:1153
+#: misc/mke2fs.c:688 misc/tune2fs.c:1165
 #, c-format
 msgid "Invalid mmp_update_interval: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:702
 #, c-format
 msgid "Invalid stride parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:716
+#: misc/mke2fs.c:717
 #, c-format
 msgid "Invalid stripe-width parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:739
+#: misc/mke2fs.c:740
 #, c-format
 msgid "Invalid resize parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:746
+#: misc/mke2fs.c:747
 #, c-format
 msgid "The resize maximum must be greater than the filesystem size.\n"
 msgstr ""
 
-#: misc/mke2fs.c:770
+#: misc/mke2fs.c:771
 #, c-format
 msgid "On-line resizing not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:802
+#: misc/mke2fs.c:809
+#, c-format
+msgid "Invalid quotatype parameter: %s\n"
+msgstr ""
+
+#: misc/mke2fs.c:820
 #, c-format
 msgid ""
 "\n"
@@ -4055,10 +4060,11 @@ msgid ""
 "\ttest_fs\n"
 "\tdiscard\n"
 "\tnodiscard\n"
+"\tquotatype=<usr OR grp>\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:821
+#: misc/mke2fs.c:840
 #, c-format
 msgid ""
 "\n"
@@ -4066,43 +4072,43 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:857
+#: misc/mke2fs.c:879
 #, c-format
 msgid ""
 "Syntax error in mke2fs config file (%s, line #%d)\n"
 "\t%s\n"
 msgstr ""
 
-#: misc/mke2fs.c:870 misc/tune2fs.c:393
+#: misc/mke2fs.c:892 misc/tune2fs.c:393
 #, c-format
 msgid "Invalid filesystem option set: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:882 misc/tune2fs.c:345
+#: misc/mke2fs.c:904 misc/tune2fs.c:345
 #, c-format
 msgid "Invalid mount option set: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1020
+#: misc/mke2fs.c:1042
 #, c-format
 msgid ""
 "\n"
 "Your mke2fs.conf file does not define the %s filesystem type.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1024
+#: misc/mke2fs.c:1046
 #, c-format
 msgid ""
 "You probably need to install an updated mke2fs.conf file.\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1028
+#: misc/mke2fs.c:1050
 #, c-format
 msgid "Aborting...\n"
 msgstr ""
 
-#: misc/mke2fs.c:1068
+#: misc/mke2fs.c:1090
 #, c-format
 msgid ""
 "\n"
@@ -4110,126 +4116,126 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1226
+#: misc/mke2fs.c:1248
 #, c-format
 msgid "Couldn't allocate memory for new PATH.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1267
+#: misc/mke2fs.c:1289
 #, c-format
 msgid "Couldn't init profile successfully (error: %ld).\n"
 msgstr ""
 
-#: misc/mke2fs.c:1307
+#: misc/mke2fs.c:1329
 #, c-format
 msgid "invalid block size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1311
+#: misc/mke2fs.c:1333
 #, c-format
 msgid "Warning: blocksize %d not usable on most systems.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1327
+#: misc/mke2fs.c:1349
 #, c-format
 msgid "invalid cluster size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1336
+#: misc/mke2fs.c:1358
 msgid "Illegal number for blocks per group"
 msgstr ""
 
-#: misc/mke2fs.c:1341
+#: misc/mke2fs.c:1363
 msgid "blocks per group must be multiple of 8"
 msgstr ""
 
-#: misc/mke2fs.c:1349
+#: misc/mke2fs.c:1371
 msgid "Illegal number for flex_bg size"
 msgstr ""
 
-#: misc/mke2fs.c:1355
+#: misc/mke2fs.c:1377
 msgid "flex_bg size must be a power of 2"
 msgstr ""
 
-#: misc/mke2fs.c:1365
+#: misc/mke2fs.c:1387
 #, c-format
 msgid "invalid inode ratio %s (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1375
+#: misc/mke2fs.c:1397
 #, c-format
 msgid ""
 "Warning: -K option is deprecated and should not be used anymore. Use '-E "
 "nodiscard' extended option instead!\n"
 msgstr ""
 
-#: misc/mke2fs.c:1389
+#: misc/mke2fs.c:1411
 msgid "in malloc for bad_blocks_filename"
 msgstr ""
 
-#: misc/mke2fs.c:1399
+#: misc/mke2fs.c:1421
 #, c-format
 msgid "invalid reserved blocks percent - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1417
+#: misc/mke2fs.c:1439
 #, c-format
 msgid "bad revision level - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1429
+#: misc/mke2fs.c:1451
 #, c-format
 msgid "invalid inode size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1449
+#: misc/mke2fs.c:1471
 #, c-format
 msgid "bad num inodes - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1466
+#: misc/mke2fs.c:1488
 msgid "The -t option may only be used once"
 msgstr ""
 
-#: misc/mke2fs.c:1474
+#: misc/mke2fs.c:1496
 msgid "The -T option may only be used once"
 msgstr ""
 
-#: misc/mke2fs.c:1524 misc/mke2fs.c:2469
+#: misc/mke2fs.c:1546 misc/mke2fs.c:2490
 #, c-format
 msgid "while trying to open journal device %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1530
+#: misc/mke2fs.c:1552
 #, c-format
 msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1536
+#: misc/mke2fs.c:1558
 #, c-format
 msgid "Using journal device's blocksize: %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1547
+#: misc/mke2fs.c:1569
 #, c-format
 msgid "invalid blocks '%s' on device '%s'"
 msgstr ""
 
-#: misc/mke2fs.c:1557
+#: misc/mke2fs.c:1579
 msgid "filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1570 resize/main.c:379
+#: misc/mke2fs.c:1592 resize/main.c:379
 msgid "while trying to determine filesystem size"
 msgstr ""
 
-#: misc/mke2fs.c:1576
+#: misc/mke2fs.c:1598
 msgid ""
 "Couldn't determine device size; you must specify\n"
 "the size of the filesystem\n"
 msgstr ""
 
-#: misc/mke2fs.c:1583
+#: misc/mke2fs.c:1605
 msgid ""
 "Device size reported to be zero.  Invalid partition specified, or\n"
 "\tpartition table wasn't reread after running fdisk, due to\n"
@@ -4237,126 +4243,126 @@ msgid ""
 "\tto re-read your partition table.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1600
+#: misc/mke2fs.c:1622
 msgid "Filesystem larger than apparent device size."
 msgstr ""
 
-#: misc/mke2fs.c:1620
+#: misc/mke2fs.c:1642
 #, c-format
 msgid "Failed to parse fs types list\n"
 msgstr ""
 
-#: misc/mke2fs.c:1674
+#: misc/mke2fs.c:1696
 #, c-format
 msgid ""
 "%s: Size of device (0x%llx blocks) %s too big to be expressed\n"
 "\tin 32 bits using a blocksize of %d.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1690
+#: misc/mke2fs.c:1712
 msgid "fs_types for mke2fs.conf resolution: "
 msgstr ""
 
-#: misc/mke2fs.c:1697
+#: misc/mke2fs.c:1719
 #, c-format
 msgid "Filesystem features not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1704
+#: misc/mke2fs.c:1726
 #, c-format
 msgid "Sparse superblocks not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1716
+#: misc/mke2fs.c:1738
 #, c-format
 msgid "Journals not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1730
+#: misc/mke2fs.c:1752
 #, c-format
 msgid "invalid reserved blocks percent - %lf"
 msgstr ""
 
-#: misc/mke2fs.c:1746
+#: misc/mke2fs.c:1768
 #, c-format
 msgid ""
 "The resize_inode and meta_bg features are not compatible.\n"
 "They can not be both enabled simultaneously.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1763
+#: misc/mke2fs.c:1785
 msgid "while trying to determine hardware sector size"
 msgstr ""
 
-#: misc/mke2fs.c:1769
+#: misc/mke2fs.c:1791
 msgid "while trying to determine physical sector size"
 msgstr ""
 
-#: misc/mke2fs.c:1802
+#: misc/mke2fs.c:1824
 msgid "while setting blocksize; too small for device\n"
 msgstr ""
 
-#: misc/mke2fs.c:1807
+#: misc/mke2fs.c:1829
 #, c-format
 msgid ""
 "Warning: specified blocksize %d is less than device physical sectorsize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1838
+#: misc/mke2fs.c:1860
 #, c-format
 msgid "warning: Unable to get device geometry for %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1841
+#: misc/mke2fs.c:1863
 #, c-format
 msgid "%s alignment is offset by %lu bytes.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1843
+#: misc/mke2fs.c:1865
 #, c-format
 msgid ""
 "This may result in very poor performance, (re)-partitioning suggested.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1854
+#: misc/mke2fs.c:1876
 #, c-format
 msgid "%d-byte blocks too big for system (max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1858
+#: misc/mke2fs.c:1880
 #, c-format
 msgid ""
 "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
 msgstr ""
 
-#: misc/mke2fs.c:1893
+#: misc/mke2fs.c:1915
 msgid "reserved online resize blocks not supported on non-sparse filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1902
+#: misc/mke2fs.c:1924
 msgid "blocks per group count out of range"
 msgstr ""
 
-#: misc/mke2fs.c:1917
+#: misc/mke2fs.c:1939
 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
 msgstr ""
 
-#: misc/mke2fs.c:1929
+#: misc/mke2fs.c:1951
 #, c-format
 msgid "invalid inode size %d (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1947
+#: misc/mke2fs.c:1969
 #, c-format
 msgid "too many inodes (%llu), raise inode ratio?"
 msgstr ""
 
-#: misc/mke2fs.c:1954
+#: misc/mke2fs.c:1976
 #, c-format
 msgid "too many inodes (%llu), specify < 2^32 inodes"
 msgstr ""
 
-#: misc/mke2fs.c:1968
+#: misc/mke2fs.c:1990
 #, c-format
 msgid ""
 "inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4364,7 +4370,7 @@ msgid ""
 "\tor lower inode count (-N).\n"
 msgstr ""
 
-#: misc/mke2fs.c:2087
+#: misc/mke2fs.c:2109
 #, c-format
 msgid ""
 "Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4372,112 +4378,112 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:2101
+#: misc/mke2fs.c:2123
 msgid "while trying to setup undo file\n"
 msgstr ""
 
-#: misc/mke2fs.c:2127
+#: misc/mke2fs.c:2149
 msgid "Discarding device blocks: "
 msgstr ""
 
-#: misc/mke2fs.c:2143
+#: misc/mke2fs.c:2165
 msgid "failed - "
 msgstr ""
 
-#: misc/mke2fs.c:2249
+#: misc/mke2fs.c:2270
 msgid "while setting up superblock"
 msgstr ""
 
-#: misc/mke2fs.c:2258
+#: misc/mke2fs.c:2279
 #, c-format
 msgid "Discard succeeded and will return 0s  - skipping inode table wipe\n"
 msgstr ""
 
-#: misc/mke2fs.c:2341
+#: misc/mke2fs.c:2362
 #, c-format
 msgid "unknown os - %s"
 msgstr ""
 
-#: misc/mke2fs.c:2393
+#: misc/mke2fs.c:2414
 #, c-format
 msgid "Allocating group tables: "
 msgstr ""
 
-#: misc/mke2fs.c:2397
+#: misc/mke2fs.c:2418
 msgid "while trying to allocate filesystem tables"
 msgstr ""
 
-#: misc/mke2fs.c:2406
+#: misc/mke2fs.c:2427
 msgid ""
 "\n"
 "\twhile converting subcluster bitmap"
 msgstr ""
 
-#: misc/mke2fs.c:2438
+#: misc/mke2fs.c:2459
 #, c-format
 msgid "while zeroing block %llu at end of filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:2451
+#: misc/mke2fs.c:2472
 msgid "while reserving blocks for online resize"
 msgstr ""
 
-#: misc/mke2fs.c:2462 misc/tune2fs.c:640
+#: misc/mke2fs.c:2483 misc/tune2fs.c:640
 msgid "journal"
 msgstr ""
 
-#: misc/mke2fs.c:2474
+#: misc/mke2fs.c:2495
 #, c-format
 msgid "Adding journal to device %s: "
 msgstr ""
 
-#: misc/mke2fs.c:2481
+#: misc/mke2fs.c:2502
 #, c-format
 msgid ""
 "\n"
 "\twhile trying to add journal to device %s"
 msgstr ""
 
-#: misc/mke2fs.c:2486 misc/mke2fs.c:2518 misc/tune2fs.c:669 misc/tune2fs.c:683
+#: misc/mke2fs.c:2507 misc/mke2fs.c:2539 misc/tune2fs.c:669 misc/tune2fs.c:683
 #, c-format
 msgid "done\n"
 msgstr ""
 
-#: misc/mke2fs.c:2495
+#: misc/mke2fs.c:2516
 #, c-format
 msgid "Skipping journal creation in super-only mode\n"
 msgstr ""
 
-#: misc/mke2fs.c:2506
+#: misc/mke2fs.c:2527
 #, c-format
 msgid "Creating journal (%u blocks): "
 msgstr ""
 
-#: misc/mke2fs.c:2525 misc/tune2fs.c:446
+#: misc/mke2fs.c:2546 misc/tune2fs.c:446
 #, c-format
 msgid ""
 "\n"
 "Error while enabling multiple mount protection feature."
 msgstr ""
 
-#: misc/mke2fs.c:2530
+#: misc/mke2fs.c:2551
 #, c-format
 msgid "Multiple mount protection is enabled with update interval %d seconds.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2543
+#: misc/mke2fs.c:2564
 #, c-format
 msgid "Writing superblocks and filesystem accounting information: "
 msgstr ""
 
-#: misc/mke2fs.c:2550
+#: misc/mke2fs.c:2571
 #, c-format
 msgid ""
 "\n"
 "Warning, had trouble writing out superblocks."
 msgstr ""
 
-#: misc/mke2fs.c:2552
+#: misc/mke2fs.c:2573
 #, c-format
 msgid ""
 "done\n"
@@ -4682,11 +4688,11 @@ msgid ""
 "\twhile trying to create journal file"
 msgstr ""
 
-#: misc/tune2fs.c:751
+#: misc/tune2fs.c:763
 msgid "Couldn't allocate memory to parse quota options!\n"
 msgstr ""
 
-#: misc/tune2fs.c:773
+#: misc/tune2fs.c:785
 msgid ""
 "\n"
 "Bad quota options specified.\n"
@@ -4699,70 +4705,70 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/tune2fs.c:834
+#: misc/tune2fs.c:846
 #, c-format
 msgid "Couldn't parse date/time specifier: %s"
 msgstr ""
 
-#: misc/tune2fs.c:858 misc/tune2fs.c:871
+#: misc/tune2fs.c:870 misc/tune2fs.c:883
 #, c-format
 msgid "bad mounts count - %s"
 msgstr ""
 
-#: misc/tune2fs.c:887
+#: misc/tune2fs.c:899
 #, c-format
 msgid "bad error behavior - %s"
 msgstr ""
 
-#: misc/tune2fs.c:914
+#: misc/tune2fs.c:926
 #, c-format
 msgid "bad gid/group name - %s"
 msgstr ""
 
-#: misc/tune2fs.c:947
+#: misc/tune2fs.c:959
 #, c-format
 msgid "bad interval - %s"
 msgstr ""
 
-#: misc/tune2fs.c:976
+#: misc/tune2fs.c:988
 #, c-format
 msgid "bad reserved block ratio - %s"
 msgstr ""
 
-#: misc/tune2fs.c:991
+#: misc/tune2fs.c:1003
 msgid "-o may only be specified once"
 msgstr ""
 
-#: misc/tune2fs.c:1000
+#: misc/tune2fs.c:1012
 msgid "-O may only be specified once"
 msgstr ""
 
-#: misc/tune2fs.c:1015
+#: misc/tune2fs.c:1027
 #, c-format
 msgid "bad reserved blocks count - %s"
 msgstr ""
 
-#: misc/tune2fs.c:1044
+#: misc/tune2fs.c:1056
 #, c-format
 msgid "bad uid/user name - %s"
 msgstr ""
 
-#: misc/tune2fs.c:1061
+#: misc/tune2fs.c:1073
 #, c-format
 msgid "bad inode size - %s"
 msgstr ""
 
-#: misc/tune2fs.c:1068
+#: misc/tune2fs.c:1080
 #, c-format
 msgid "Inode size must be a power of two- %s"
 msgstr ""
 
-#: misc/tune2fs.c:1162
+#: misc/tune2fs.c:1174
 #, c-format
 msgid "mmp_update_interval too big: %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1167
+#: misc/tune2fs.c:1179
 #, c-format
 msgid "Setting multiple mount protection update interval to %lu second\n"
 msgid_plural ""
@@ -4770,27 +4776,27 @@ msgid_plural ""
 msgstr[0] ""
 msgstr[1] ""
 
-#: misc/tune2fs.c:1190
+#: misc/tune2fs.c:1202
 #, c-format
 msgid "Invalid RAID stride: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:1205
+#: misc/tune2fs.c:1217
 #, c-format
 msgid "Invalid RAID stripe-width: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:1220
+#: misc/tune2fs.c:1232
 #, c-format
 msgid "Invalid hash algorithm: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:1226
+#: misc/tune2fs.c:1238
 #, c-format
 msgid "Setting default hash algorithm to %s (%d)\n"
 msgstr ""
 
-#: misc/tune2fs.c:1245
+#: misc/tune2fs.c:1257
 #, c-format
 msgid ""
 "\n"
@@ -4809,46 +4815,46 @@ msgid ""
 "\t^test_fs\n"
 msgstr ""
 
-#: misc/tune2fs.c:1710
+#: misc/tune2fs.c:1723
 msgid "Failed to read inode bitmap\n"
 msgstr ""
 
-#: misc/tune2fs.c:1715
+#: misc/tune2fs.c:1728
 msgid "Failed to read block bitmap\n"
 msgstr ""
 
-#: misc/tune2fs.c:1732 resize/resize2fs.c:784
+#: misc/tune2fs.c:1745 resize/resize2fs.c:784
 msgid "blocks to be moved"
 msgstr ""
 
-#: misc/tune2fs.c:1735
+#: misc/tune2fs.c:1748
 msgid "Failed to allocate block bitmap when increasing inode size\n"
 msgstr ""
 
-#: misc/tune2fs.c:1741
+#: misc/tune2fs.c:1754
 msgid "Not enough space to increase inode size \n"
 msgstr ""
 
-#: misc/tune2fs.c:1746
+#: misc/tune2fs.c:1759
 msgid "Failed to relocate blocks during inode resize \n"
 msgstr ""
 
-#: misc/tune2fs.c:1778
+#: misc/tune2fs.c:1791
 msgid ""
 "Error in resizing the inode size.\n"
 "Run e2undo to undo the file system changes. \n"
 msgstr ""
 
-#: misc/tune2fs.c:1805
+#: misc/tune2fs.c:1818
 msgid "Couldn't allocate memory for tdb filename\n"
 msgstr ""
 
-#: misc/tune2fs.c:1827
+#: misc/tune2fs.c:1840
 #, c-format
 msgid "while trying to delete %s"
 msgstr ""
 
-#: misc/tune2fs.c:1837
+#: misc/tune2fs.c:1850
 #, c-format
 msgid ""
 "To undo the tune2fs operation please run the command\n"
@@ -4856,141 +4862,141 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/tune2fs.c:1906
+#: misc/tune2fs.c:1919
 #, c-format
 msgid ""
 "MMP block magic is bad. Try to fix it by running:\n"
 "'e2fsck -f %s'\n"
 msgstr ""
 
-#: misc/tune2fs.c:1923
+#: misc/tune2fs.c:1936
 #, c-format
 msgid "The inode size is already %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1929
+#: misc/tune2fs.c:1942
 #, c-format
 msgid "Shrinking the inode size is not supported\n"
 msgstr ""
 
-#: misc/tune2fs.c:1976
+#: misc/tune2fs.c:1989
 #, c-format
 msgid "Setting maximal mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1982
+#: misc/tune2fs.c:1995
 #, c-format
 msgid "Setting current mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1987
+#: misc/tune2fs.c:2000
 #, c-format
 msgid "Setting error behavior to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1992
+#: misc/tune2fs.c:2005
 #, c-format
 msgid "Setting reserved blocks gid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1997
+#: misc/tune2fs.c:2010
 #, c-format
 msgid "interval between checks is too big (%lu)"
 msgstr ""
 
-#: misc/tune2fs.c:2004
+#: misc/tune2fs.c:2017
 #, c-format
 msgid "Setting interval between checks to %lu seconds\n"
 msgstr ""
 
-#: misc/tune2fs.c:2011
+#: misc/tune2fs.c:2024
 #, c-format
 msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n"
 msgstr ""
 
-#: misc/tune2fs.c:2017
+#: misc/tune2fs.c:2030
 #, c-format
 msgid "reserved blocks count is too big (%llu)"
 msgstr ""
 
-#: misc/tune2fs.c:2024
+#: misc/tune2fs.c:2037
 #, c-format
 msgid "Setting reserved blocks count to %llu\n"
 msgstr ""
 
-#: misc/tune2fs.c:2030
+#: misc/tune2fs.c:2043
 msgid ""
 "\n"
 "The filesystem already has sparse superblocks.\n"
 msgstr ""
 
-#: misc/tune2fs.c:2037
+#: misc/tune2fs.c:2050
 #, c-format
 msgid ""
 "\n"
 "Sparse superblock flag set.  %s"
 msgstr ""
 
-#: misc/tune2fs.c:2042
+#: misc/tune2fs.c:2055
 msgid ""
 "\n"
 "Clearing the sparse superflag not supported.\n"
 msgstr ""
 
-#: misc/tune2fs.c:2050
+#: misc/tune2fs.c:2063
 #, c-format
 msgid "Setting time filesystem last checked to %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:2056
+#: misc/tune2fs.c:2069
 #, c-format
 msgid "Setting reserved blocks uid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:2088
+#: misc/tune2fs.c:2101
 msgid "Error in using clear_mmp. It must be used with -f\n"
 msgstr ""
 
-#: misc/tune2fs.c:2106
+#: misc/tune2fs.c:2119
 msgid ""
 "The quota feature may only be changed when the filesystem is unmounted.\n"
 msgstr ""
 
-#: misc/tune2fs.c:2139
+#: misc/tune2fs.c:2152
 msgid "Invalid UUID format\n"
 msgstr ""
 
-#: misc/tune2fs.c:2152
+#: misc/tune2fs.c:2165
 msgid "The inode size may only be changed when the filesystem is unmounted.\n"
 msgstr ""
 
-#: misc/tune2fs.c:2160
+#: misc/tune2fs.c:2173
 msgid ""
 "Changing the inode size not supported for filesystems with the flex_bg\n"
 "feature enabled.\n"
 msgstr ""
 
-#: misc/tune2fs.c:2173
+#: misc/tune2fs.c:2186
 #, c-format
 msgid "Setting inode size %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:2176
+#: misc/tune2fs.c:2189
 #, c-format
 msgid "Failed to change inode size\n"
 msgstr ""
 
-#: misc/tune2fs.c:2187
+#: misc/tune2fs.c:2200
 #, c-format
 msgid "Setting stride size to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:2192
+#: misc/tune2fs.c:2205
 #, c-format
 msgid "Setting stripe width to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:2199
+#: misc/tune2fs.c:2212
 #, c-format
 msgid "Setting extended default mount options to '%s'\n"
 msgstr ""
@@ -5375,37 +5381,37 @@ msgstr ""
 msgid "while trying to open mountpoint %s"
 msgstr ""
 
-#: resize/online.c:78 resize/online.c:102
+#: resize/online.c:92 resize/online.c:116
 msgid "Permission denied to resize filesystem"
 msgstr ""
 
-#: resize/online.c:81 resize/online.c:108
+#: resize/online.c:95 resize/online.c:122
 msgid "While checking for on-line resizing support"
 msgstr ""
 
-#: resize/online.c:93
+#: resize/online.c:107
 msgid "Kernel does not support resizing a file system this large"
 msgstr ""
 
-#: resize/online.c:105
+#: resize/online.c:119
 msgid "Kernel does not support online resizing"
 msgstr ""
 
-#: resize/online.c:138
+#: resize/online.c:152
 #, c-format
 msgid "Performing an on-line resize of %s to %llu (%dk) blocks.\n"
 msgstr ""
 
-#: resize/online.c:148
+#: resize/online.c:162
 msgid "While trying to extend the last group"
 msgstr ""
 
-#: resize/online.c:202
+#: resize/online.c:216
 #, c-format
 msgid "While trying to add group #%d"
 msgstr ""
 
-#: resize/online.c:213
+#: resize/online.c:227
 #, c-format
 msgid ""
 "Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
@@ -5425,7 +5431,7 @@ msgstr ""
 msgid "meta-data blocks"
 msgstr ""
 
-#: resize/resize2fs.c:1734
+#: resize/resize2fs.c:1735
 #, c-format
 msgid "Should never happen: resize inode corrupt!\n"
 msgstr ""
diff --git a/version.h b/version.h
index 4ad17e94..161fd2c3 100644
--- a/version.h
+++ b/version.h
@@ -8,4 +8,4 @@
  */
 
 #define E2FSPROGS_VERSION "1.42-WIP"
-#define E2FSPROGS_DATE "16-Oct-2011"
+#define E2FSPROGS_DATE "20-Nov-2011"