From d5b8a1e9079f80613b85efbe7994553c2c452081 Mon Sep 17 00:00:00 2001
From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 22 Nov 2010 16:10:23 -0500
Subject: [PATCH] Update Release Notes, Changelogs, version.h, etc. for 1.41.13
 release

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
 README                |   2 +-
 RELEASE-NOTES         | 110 ++++++++++
 debian/changelog      |  37 ++++
 doc/libext2fs.texinfo |   8 +-
 e2fsprogs.lsm         |  10 +-
 po/e2fsprogs.pot      | 558 ++++++++++++++++++++++++++------------------------
 version.h             |   4 +-
 7 files changed, 447 insertions(+), 282 deletions(-)

diff --git a/README b/README
index 8a44fc3..5dda86b 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-	This is the new version (1.41.12) of the second extended file
+	This is the new version (1.41.13) of the second extended file
 system management programs.
 
 	From time to time, I release new versions of e2fsprogs, to fix
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c9c8052..59a94b2 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,113 @@
+E2fsprogs 1.41.13 (November 22, 2010)
+=====================================
+
+E2fsck will open the external journal in exclusive mode, to prevent
+the journal from getting truncated while it is in use due to a user
+accidentally trying to run e2fsck on a snapshotted file system volume.
+(Addresses Debian Bug: #587531)
+
+Fix a bug in e2fsck so it has the correct test for the EOFBLOCKS_FL
+flag.
+
+The tune2fs program can now set the uninit_bg feature without
+requiring an fsck.
+
+The tune2fs, dumpe2fs, and debugfs programs now support the new ext4
+default mount options settings which were added in 2.6.35.
+
+The e2fsck and dumpe2fs programs now support the new ext4 superblock
+fields which track where and when the first and most recent file
+system errors occurred.  These fields are displayed by dumpe2fs and
+cleared by e2fsck.  These new superblock fields were added in 2.6.36.
+
+Debugfs now uses a more concicse format for listing extents in its
+stat command.  This format also includes the interior extent tree
+blocks, which previously was missing from stat's output for
+extent-based files.
+
+Debugfs has a new option, -D, which will request Direct I/O access of
+the file system.
+
+Mke2fs will skip initializing the inode table if a device supports
+discard and the discard operation will result in zero'ed blocks.
+
+Badblocks will now correctly backspace over UTF-8 characters when
+displaying its progress bar.  (Addresses Gentoo Bug #309909; Addresses
+Debian Bugs #583782 and #587834)
+
+E2freefrag will now display the total number of free extents.
+
+Resize2fs -P no longer requires a freshly checked filesystem before
+printing the minimum resize size.
+
+Fixed a floating point precision error in a binary tree search routine
+that can lead to seg fault in e2fsck and resize2fs.
+
+Fixed a bug in e2fsck where if both the original and backup superblock
+are invalid in some way, e2fsck will fail going back to the original
+superblock because it didn't close the backup superblock first, and
+the exclusive open prevented the file system from being reopened.
+
+Fixed a big in e2freefrag which caused getopt parsing to fail on
+architectures with unsigned chars.  (Addresses Gentoo Bug: #299386)
+
+Clarified an mke2fs error message so a missed common in an -E option
+(i.e., mke2fs -t ext4 -E stride=128 stripe-width=512 /dev/sda1")
+results in a more understandable explanation to the user.
+
+Mke2fs now displays the correct valid inode ratio range when
+complaining about an invalid inode ratio specified by the user.
+
+Mke2fs now understands the extended option "discard" and "nodiscard",
+and the older option -K is deprecated.  The default of whether
+discards are enabled by default can be controled by the mke2fs.conf
+file.
+
+Mke2fs's handling of logical and physical sector sizes has been
+improved to reflect the fact that there will be some SSD's with 8k and
+16k physical sectors arriving soon.  Mke2fs will no longer force block
+size to be the physical sector size, since there will be devices where
+the physical sector size is larger than the system's page size, and
+hence larger than the maximal supported block size.  In addition, if
+the minimal and optimal io size are not exported by the device, and
+the physical sector size is larger than the block size, the physical
+sector size will be used to set the Raid I/O optimization hints in the
+superblock.
+
+E2fsck will now display a better, more specific error message when the
+user enters a typo'ed device name, instead of blathering on about
+alternate superblocks.
+
+Fixed various Debian Packaging Issues
+
+Updated/clarified man pages (Addresses Debian Bugs: #580236, #594004, #589345)
+
+Update the Chinese, Chzech, Dutch, French, Germany, Indonesian,
+Polish, Swedish, and Vietnamese translations.
+
+
+Programmer's Notes
+------------------
+
+Add support for Direct I/O in the Unix I/O access layer.
+
+Fixed a memory leak in the Unix I/O layer when changing block sizes.
+
+Added a new function to the ext2fs library, ext2fs_get_memalign().
+
+The tst_super_size test program will check to make sure the superblock
+fields are correctly aligned and will print them out so they can be
+manually checked for correctness.
+
+Fixed some makefile dependencies for test programs in lib/ext2fs.
+
+Reserved the feature flags and superblock fields needed for the Next3
+snapshot feature.
+
+Reserved the feature flags for EXT4_FEATURE_INCOMPAT_DIRDATA and
+EXT4_INCOMPAT_EA_INODE.
+
+
 E2fsprogs 1.41.12 (May 17, 2010)
 ================================
 
diff --git a/debian/changelog b/debian/changelog
index ec254dd..844c3ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,40 @@
+e2fsprogs (1.41.13-1) unstable; urgency=low
+
+  * New upstream release
+  * Fixed outdated mention of fsck in the e2fsprogs package (Closes: #588726)
+  * Removed obsolete initrd script (Closes: #585041)
+  * Fixed bad dependency on libblkid1 due to shlibs.local (Closes: #583551)
+  * E2fsck now opens the external journal in exclusive mode to prevent
+    clearing the journal of a mounted, snapshotted volume if the user
+    accidentally tries to run e2fsck on the snapshot volume (Closes: #587531)
+  * Fix a big in e2fsck so it correct test for whether the EOFBLOCKS_FL
+    flag should be set or not.
+  * Tune2fs can now set uninit_bg without requiring an fsck afterwards
+  * Add support for the new ext4 default mount options added in 2.6.35
+  * Add support for the ext4 error tracking superblock fields added in 2.6.36
+  * Debugfs now uses a more concise format for listing extents in its
+    stat command
+  * Debugfs can now use direct I/O to access the file system with the -D option
+  * Mke2fs will skip initializing the inode table if a device supports
+    discard and the discard operation results in zero'ed blocks
+  * Mke2fs's handling of logical and physical sector sizes has been
+    significantly improved.
+  * Debugfs will correctly show the progress bar even when UTF-8
+    characters are used in its translation files (Closes: #583782, #587834)
+  * E2freefrag will now display the total number of free extents.
+  * Resize2fs -P now longer requires a freshly checked file system
+  * Fixed a floating point precision error that can cause segfaults in
+    e2fsck and resize2fs in extremely rare cases
+  * Fixed a bug in e2fsck which caused it to fail if both the original
+    and backup superblocks were invalid in some way
+  * Fixed a bug in e2freefrag which caused getopt parsing to fail on
+    architectures with unsigned chars
+  * Clarified mke2fs and e2fsck error messages when given incorrect
+    options/values by the user
+  * Updated/clarified man pages (Closes: #580236, #594004, #589345)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 22 Nov 2010 16:00:50 -0400
+
 e2fsprogs (1.41.12-2) unstable; urgency=high
 
   * Allow tune2fs to set uninit_bg without requiring an fsck
diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 0cd66ca..91e34b0 100644
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -1,7 +1,7 @@
 \input texinfo    @c -*-texinfo-*-
 @c %**start of header
 @setfilename libext2fs.info
-@settitle The EXT2FS Library (version 1.41.12)
+@settitle The EXT2FS Library (version 1.41.13)
 @synindex tp fn
 @comment %**end of header
 
@@ -60,8 +60,8 @@ by the author.
 
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
-@subtitle Version 1.41.12
-@subtitle May 2010
+@subtitle Version 1.41.13
+@subtitle November 2010
 
 @author by Theodore Ts'o
 
@@ -102,7 +102,7 @@ by the Foundation.
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.41.12.
+This manual documents the EXT2FS Library, version 1.41.13.
 
 @end ifinfo
 
diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index db34595..22286d0 100644
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,16 +1,16 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.41.12
-Entered-date:   17May2010
+Version:        1.41.13
+Entered-date:   22Nov2010
 Description:    The filesystem utilities for the EXT2 filesystem, including 
 		e2fsck, mke2fs, dumpe2fs, fsck, and others.
 Keywords:       utilities, fsck, filesystem, Ext2fs
 Author:         tytso@mit.edu (Theodore Tso)
 Maintained-by:  tytso@mit.edu (Theodore Tso)
 Primary-site:   download.sourceforge.net /pub/sourceforge/e2fsprogs
-		4392kB e2fsprogs-1.41.12.tar.gz
-		480kB e2fsprogs-libs-1.41.12.tar.gz
-                1kB   e2fsprogs-1.41.12.lsm
+		4408kB e2fsprogs-1.41.13.tar.gz
+		480kB e2fsprogs-libs-1.41.13.tar.gz
+                1kB   e2fsprogs-1.41.13.lsm
 Alternate-site: 
 Platforms:	linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x
 Copying-policy: GPL-2/LGPL-2
diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index f3b5849..37f6adc 100644
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -65,9 +65,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: e2fsprogs 1.41.12\n"
+"Project-Id-Version: e2fsprogs 1.41.13\n"
 "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
-"POT-Creation-Date: 2010-05-17 23:05-0400\n"
+"POT-Creation-Date: 2010-11-22 15:26-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"
@@ -89,10 +89,10 @@ msgid "while reading the bad blocks inode"
 msgstr ""
 
 #: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1083 e2fsck/unix.c:1166 misc/badblocks.c:1155
-#: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189
+#: e2fsck/unix.c:1085 e2fsck/unix.c:1170 misc/badblocks.c:1158
+#: misc/badblocks.c:1166 misc/badblocks.c:1180 misc/badblocks.c:1192
 #: misc/dumpe2fs.c:552 misc/e2image.c:583 misc/e2image.c:679
-#: misc/e2image.c:695 misc/mke2fs.c:185 misc/tune2fs.c:1573 resize/main.c:310
+#: misc/e2image.c:695 misc/mke2fs.c:185 misc/tune2fs.c:1623 resize/main.c:310
 #, c-format
 msgid "while trying to open %s"
 msgstr ""
@@ -209,31 +209,31 @@ msgstr ""
 msgid "%u inodes scanned.\n"
 msgstr ""
 
-#: e2fsck/journal.c:507
+#: e2fsck/journal.c:508
 msgid "reading journal superblock\n"
 msgstr ""
 
-#: e2fsck/journal.c:564
+#: e2fsck/journal.c:565
 #, c-format
 msgid "%s: no valid journal superblock found\n"
 msgstr ""
 
-#: e2fsck/journal.c:573
+#: e2fsck/journal.c:574
 #, c-format
 msgid "%s: journal too short\n"
 msgstr ""
 
-#: e2fsck/journal.c:860
+#: e2fsck/journal.c:861
 #, c-format
 msgid "%s: recovering journal\n"
 msgstr ""
 
-#: e2fsck/journal.c:862
+#: e2fsck/journal.c:863
 #, c-format
 msgid "%s: won't do journal recovery while read-only\n"
 msgstr ""
 
-#: e2fsck/journal.c:887
+#: e2fsck/journal.c:888
 #, c-format
 msgid "while trying to re-open %s"
 msgstr ""
@@ -2441,7 +2441,7 @@ msgstr ""
 msgid "         Extent depth histogram: "
 msgstr ""
 
-#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1625 misc/util.c:151
+#: e2fsck/unix.c:207 misc/badblocks.c:931 misc/tune2fs.c:1675 misc/util.c:151
 #: resize/main.c:249
 #, c-format
 msgid "while determining whether %s is mounted."
@@ -2583,7 +2583,7 @@ msgstr ""
 msgid "The -n and -l/-L options are incompatible."
 msgstr ""
 
-#: e2fsck/unix.c:822 misc/tune2fs.c:550 misc/tune2fs.c:835 misc/tune2fs.c:853
+#: e2fsck/unix.c:822 misc/tune2fs.c:588 misc/tune2fs.c:873 misc/tune2fs.c:891
 #, c-format
 msgid "Unable to resolve '%s'"
 msgstr ""
@@ -2639,12 +2639,12 @@ msgstr ""
 msgid "Group descriptors look bad..."
 msgstr ""
 
-#: e2fsck/unix.c:1059
+#: e2fsck/unix.c:1061
 #, c-format
 msgid "%s: going back to original superblock\n"
 msgstr ""
 
-#: e2fsck/unix.c:1086
+#: e2fsck/unix.c:1088
 #, c-format
 msgid ""
 "The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2652,142 +2652,147 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1092
+#: e2fsck/unix.c:1094
 #, c-format
 msgid "Could this be a zero-length partition?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1094
+#: e2fsck/unix.c:1096
 #, c-format
 msgid "You must have %s access to the filesystem or be root\n"
 msgstr ""
 
-#: e2fsck/unix.c:1099
+#: e2fsck/unix.c:1101
 #, c-format
 msgid "Possibly non-existent or swap device?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1101
+#: e2fsck/unix.c:1103
 #, c-format
 msgid "Filesystem mounted or opened exclusively by another program?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1105
+#: e2fsck/unix.c:1106
+#, c-format
+msgid "Possibly non-existent device?\n"
+msgstr ""
+
+#: e2fsck/unix.c:1109
 #, c-format
 msgid ""
 "Disk write-protected; use the -n option to do a read-only\n"
 "check of the device.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1169
+#: e2fsck/unix.c:1173
 msgid "Get a newer version of e2fsck!"
 msgstr ""
 
-#: e2fsck/unix.c:1199
+#: e2fsck/unix.c:1203
 #, c-format
 msgid "while checking ext3 journal for %s"
 msgstr ""
 
-#: e2fsck/unix.c:1210
+#: e2fsck/unix.c:1214
 #, c-format
 msgid ""
 "Warning: skipping journal recovery because doing a read-only filesystem "
 "check.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1223
+#: e2fsck/unix.c:1227
 #, c-format
 msgid "unable to set superblock flags on %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1229
+#: e2fsck/unix.c:1233
 #, c-format
 msgid "while recovering ext3 journal of %s"
 msgstr ""
 
-#: e2fsck/unix.c:1254
+#: e2fsck/unix.c:1258
 #, c-format
 msgid "%s has unsupported feature(s):"
 msgstr ""
 
-#: e2fsck/unix.c:1270
+#: e2fsck/unix.c:1274
 msgid "Warning: compression support is experimental.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1275
+#: e2fsck/unix.c:1279
 #, c-format
 msgid ""
 "E2fsck not compiled with HTREE support,\n"
 "\tbut filesystem %s has HTREE directories.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1328
+#: e2fsck/unix.c:1332
 msgid "while reading bad blocks inode"
 msgstr ""
 
-#: e2fsck/unix.c:1330
+#: e2fsck/unix.c:1334
 #, c-format
 msgid "This doesn't bode well, but we'll try to go on...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1356
+#: e2fsck/unix.c:1360
 msgid "Couldn't determine journal size"
 msgstr ""
 
-#: e2fsck/unix.c:1359
+#: e2fsck/unix.c:1363
 #, c-format
 msgid "Creating journal (%d blocks): "
 msgstr ""
 
-#: e2fsck/unix.c:1366 misc/mke2fs.c:2248
+#: e2fsck/unix.c:1370 misc/mke2fs.c:2304
 msgid ""
 "\n"
 "\twhile trying to create journal"
 msgstr ""
 
-#: e2fsck/unix.c:1369
+#: e2fsck/unix.c:1373
 #, c-format
 msgid " Done.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1370
+#: e2fsck/unix.c:1374
 #, c-format
 msgid ""
 "\n"
 "*** journal has been re-created - filesystem is now ext3 again ***\n"
 msgstr ""
 
-#: e2fsck/unix.c:1377
+#: e2fsck/unix.c:1381
 #, c-format
 msgid "Restarting e2fsck from the beginning...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1381
+#: e2fsck/unix.c:1385
 msgid "while resetting context"
 msgstr ""
 
-#: e2fsck/unix.c:1388
+#: e2fsck/unix.c:1392
 #, c-format
 msgid "%s: e2fsck canceled.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1393
+#: e2fsck/unix.c:1397
 msgid "aborted"
 msgstr ""
 
-#: e2fsck/unix.c:1405
+#: e2fsck/unix.c:1409
 #, c-format
 msgid ""
 "\n"
 "%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1408
+#: e2fsck/unix.c:1412
 #, c-format
 msgid "%s: ***** REBOOT LINUX *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1416
+#: e2fsck/unix.c:1420
 #, c-format
 msgid ""
 "\n"
@@ -2795,7 +2800,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1454
+#: e2fsck/unix.c:1460
 msgid "while setting block group checksum info"
 msgstr ""
 
@@ -2945,157 +2950,157 @@ msgstr ""
 msgid "%6.2f%% done, %s elapsed"
 msgstr ""
 
-#: misc/badblocks.c:293
+#: misc/badblocks.c:296
 msgid "Testing with random pattern: "
 msgstr ""
 
-#: misc/badblocks.c:311
+#: misc/badblocks.c:314
 msgid "Testing with pattern 0x"
 msgstr ""
 
-#: misc/badblocks.c:339 misc/badblocks.c:408
+#: misc/badblocks.c:342 misc/badblocks.c:411
 msgid "during seek"
 msgstr ""
 
-#: misc/badblocks.c:350
+#: misc/badblocks.c:353
 #, c-format
 msgid "Weird value (%ld) in do_read\n"
 msgstr ""
 
-#: misc/badblocks.c:428
+#: misc/badblocks.c:431
 msgid "during ext2fs_sync_device"
 msgstr ""
 
-#: misc/badblocks.c:447 misc/badblocks.c:711
+#: misc/badblocks.c:450 misc/badblocks.c:714
 msgid "while beginning bad block list iteration"
 msgstr ""
 
-#: misc/badblocks.c:461 misc/badblocks.c:563 misc/badblocks.c:721
+#: misc/badblocks.c:464 misc/badblocks.c:566 misc/badblocks.c:724
 msgid "while allocating buffers"
 msgstr ""
 
-#: misc/badblocks.c:465
+#: misc/badblocks.c:468
 #, c-format
 msgid "Checking blocks %lu to %lu\n"
 msgstr ""
 
-#: misc/badblocks.c:470
+#: misc/badblocks.c:473
 msgid "Checking for bad blocks in read-only mode\n"
 msgstr ""
 
-#: misc/badblocks.c:479
+#: misc/badblocks.c:482
 msgid "Checking for bad blocks (read-only test): "
 msgstr ""
 
-#: misc/badblocks.c:487 misc/badblocks.c:595 misc/badblocks.c:640
-#: misc/badblocks.c:784
+#: misc/badblocks.c:490 misc/badblocks.c:598 misc/badblocks.c:643
+#: misc/badblocks.c:787
 msgid "Too many bad blocks, aborting test\n"
 msgstr ""
 
-#: misc/badblocks.c:570
+#: misc/badblocks.c:573
 msgid "Checking for bad blocks in read-write mode\n"
 msgstr ""
 
-#: misc/badblocks.c:572 misc/badblocks.c:734
+#: misc/badblocks.c:575 misc/badblocks.c:737
 #, c-format
 msgid "From block %lu to %lu\n"
 msgstr ""
 
-#: misc/badblocks.c:630
+#: misc/badblocks.c:633
 msgid "Reading and comparing: "
 msgstr ""
 
-#: misc/badblocks.c:733
+#: misc/badblocks.c:736
 msgid "Checking for bad blocks in non-destructive read-write mode\n"
 msgstr ""
 
-#: misc/badblocks.c:739
+#: misc/badblocks.c:742
 msgid "Checking for bad blocks (non-destructive read-write test)\n"
 msgstr ""
 
-#: misc/badblocks.c:746
+#: misc/badblocks.c:749
 msgid ""
 "\n"
 "Interrupt caught, cleaning up\n"
 msgstr ""
 
-#: misc/badblocks.c:822
+#: misc/badblocks.c:825
 #, c-format
 msgid "during test data write, block %lu"
 msgstr ""
 
-#: misc/badblocks.c:933 misc/util.c:156
+#: misc/badblocks.c:936 misc/util.c:156
 #, c-format
 msgid "%s is mounted; "
 msgstr ""
 
-#: misc/badblocks.c:935
+#: misc/badblocks.c:938
 msgid "badblocks forced anyway.  Hope /etc/mtab is incorrect.\n"
 msgstr ""
 
-#: misc/badblocks.c:940
+#: misc/badblocks.c:943
 msgid "it's not safe to run badblocks!\n"
 msgstr ""
 
-#: misc/badblocks.c:945 misc/util.c:167
+#: misc/badblocks.c:948 misc/util.c:167
 #, c-format
 msgid "%s is apparently in use by the system; "
 msgstr ""
 
-#: misc/badblocks.c:948
+#: misc/badblocks.c:951
 msgid "badblocks forced anyway.\n"
 msgstr ""
 
-#: misc/badblocks.c:968
+#: misc/badblocks.c:971
 #, c-format
 msgid "invalid %s - %s"
 msgstr ""
 
-#: misc/badblocks.c:1077
+#: misc/badblocks.c:1080
 #, c-format
 msgid "can't allocate memory for test_pattern - %s"
 msgstr ""
 
-#: misc/badblocks.c:1104
+#: misc/badblocks.c:1107
 msgid "Maximum of one test_pattern may be specified in read-only mode"
 msgstr ""
 
-#: misc/badblocks.c:1110
+#: misc/badblocks.c:1113
 msgid "Random test_pattern is not allowed in read-only mode"
 msgstr ""
 
-#: misc/badblocks.c:1124
+#: misc/badblocks.c:1127
 msgid ""
 "Couldn't determine device size; you must specify\n"
 "the size manually\n"
 msgstr ""
 
-#: misc/badblocks.c:1130
+#: misc/badblocks.c:1133
 msgid "while trying to determine device size"
 msgstr ""
 
-#: misc/badblocks.c:1135
+#: misc/badblocks.c:1138
 msgid "last block"
 msgstr ""
 
-#: misc/badblocks.c:1141
+#: misc/badblocks.c:1144
 msgid "first block"
 msgstr ""
 
-#: misc/badblocks.c:1144
+#: misc/badblocks.c:1147
 #, c-format
 msgid "invalid starting block (%lu): must be less than %lu"
 msgstr ""
 
-#: misc/badblocks.c:1200
+#: misc/badblocks.c:1203
 msgid "while creating in-memory bad blocks list"
 msgstr ""
 
-#: misc/badblocks.c:1215
+#: misc/badblocks.c:1218
 msgid "while adding to in-memory bad block list"
 msgstr ""
 
-#: misc/badblocks.c:1239
+#: misc/badblocks.c:1242
 #, c-format
 msgid "Pass completed, %u bad blocks found.\n"
 msgstr ""
@@ -3300,7 +3305,7 @@ msgstr ""
 msgid "Journal users:            %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:407 misc/mke2fs.c:699 misc/tune2fs.c:872
+#: misc/dumpe2fs.c:407 misc/mke2fs.c:700 misc/tune2fs.c:910
 #, c-format
 msgid "Couldn't allocate memory to parse options!\n"
 msgstr ""
@@ -3329,12 +3334,12 @@ msgid ""
 "\tblocksize=<blocksize>\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:518 misc/mke2fs.c:1406
+#: misc/dumpe2fs.c:518 misc/mke2fs.c:1424
 #, c-format
 msgid "\tUsing %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:554 misc/e2image.c:681 misc/tune2fs.c:1576
+#: misc/dumpe2fs.c:554 misc/e2image.c:681 misc/tune2fs.c:1626
 #: resize/main.c:312
 #, c-format
 msgid "Couldn't find valid filesystem superblock.\n"
@@ -3397,7 +3402,7 @@ msgstr ""
 msgid "e2label: not an ext2 filesystem\n"
 msgstr ""
 
-#: misc/e2label.c:96 misc/tune2fs.c:1711
+#: misc/e2label.c:96 misc/tune2fs.c:1761
 #, c-format
 msgid "Warning: label too long, truncating.\n"
 msgstr ""
@@ -3412,7 +3417,7 @@ msgstr ""
 msgid "e2label: error writing superblock\n"
 msgstr ""
 
-#: misc/e2label.c:116 misc/tune2fs.c:542
+#: misc/e2label.c:116 misc/tune2fs.c:580
 #, c-format
 msgid "Usage: e2label device [newlabel]\n"
 msgstr ""
@@ -3638,175 +3643,175 @@ msgstr ""
 msgid "Writing inode tables: "
 msgstr ""
 
-#: misc/mke2fs.c:387
+#: misc/mke2fs.c:388
 #, c-format
 msgid ""
 "\n"
 "Could not write %d blocks in inode table starting at %u: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:411
+#: misc/mke2fs.c:412
 msgid "while creating root dir"
 msgstr ""
 
-#: misc/mke2fs.c:418
+#: misc/mke2fs.c:419
 msgid "while reading root inode"
 msgstr ""
 
-#: misc/mke2fs.c:432
+#: misc/mke2fs.c:433
 msgid "while setting root inode ownership"
 msgstr ""
 
-#: misc/mke2fs.c:450
+#: misc/mke2fs.c:451
 msgid "while creating /lost+found"
 msgstr ""
 
-#: misc/mke2fs.c:457
+#: misc/mke2fs.c:458
 msgid "while looking up /lost+found"
 msgstr ""
 
-#: misc/mke2fs.c:470
+#: misc/mke2fs.c:471
 msgid "while expanding /lost+found"
 msgstr ""
 
-#: misc/mke2fs.c:485
+#: misc/mke2fs.c:486
 msgid "while setting bad block inode"
 msgstr ""
 
-#: misc/mke2fs.c:512
+#: misc/mke2fs.c:513
 #, c-format
 msgid "Out of memory erasing sectors %d-%d\n"
 msgstr ""
 
-#: misc/mke2fs.c:522
+#: misc/mke2fs.c:523
 #, c-format
 msgid "Warning: could not read block 0: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:538
+#: misc/mke2fs.c:539
 #, c-format
 msgid "Warning: could not erase sector %d: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:554
+#: misc/mke2fs.c:555
 msgid "while initializing journal superblock"
 msgstr ""
 
-#: misc/mke2fs.c:560
+#: misc/mke2fs.c:561
 msgid "Zeroing journal device: "
 msgstr ""
 
-#: misc/mke2fs.c:573
+#: misc/mke2fs.c:574
 #, c-format
 msgid "while zeroing journal device (block %u, count %d)"
 msgstr ""
 
-#: misc/mke2fs.c:589
+#: misc/mke2fs.c:590
 msgid "while writing journal superblock"
 msgstr ""
 
-#: misc/mke2fs.c:605
+#: misc/mke2fs.c:606
 #, c-format
 msgid ""
 "warning: %u blocks unused.\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:610
+#: misc/mke2fs.c:611
 #, c-format
 msgid "Filesystem label=%s\n"
 msgstr ""
 
-#: misc/mke2fs.c:611
+#: misc/mke2fs.c:612
 msgid "OS type: "
 msgstr ""
 
-#: misc/mke2fs.c:616
+#: misc/mke2fs.c:617
 #, c-format
 msgid "Block size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:618
+#: misc/mke2fs.c:619
 #, c-format
 msgid "Fragment size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:620
+#: misc/mke2fs.c:621
 #, c-format
 msgid "Stride=%u blocks, Stripe width=%u blocks\n"
 msgstr ""
 
-#: misc/mke2fs.c:622
+#: misc/mke2fs.c:623
 #, c-format
 msgid "%u inodes, %u blocks\n"
 msgstr ""
 
-#: misc/mke2fs.c:624
+#: misc/mke2fs.c:625
 #, c-format
 msgid "%u blocks (%2.2f%%) reserved for the super user\n"
 msgstr ""
 
-#: misc/mke2fs.c:627
+#: misc/mke2fs.c:628
 #, c-format
 msgid "First data block=%u\n"
 msgstr ""
 
-#: misc/mke2fs.c:629
+#: misc/mke2fs.c:630
 #, c-format
 msgid "Maximum filesystem blocks=%lu\n"
 msgstr ""
 
-#: misc/mke2fs.c:633
+#: misc/mke2fs.c:634
 #, c-format
 msgid "%u block groups\n"
 msgstr ""
 
-#: misc/mke2fs.c:635
+#: misc/mke2fs.c:636
 #, c-format
 msgid "%u block group\n"
 msgstr ""
 
-#: misc/mke2fs.c:636
+#: misc/mke2fs.c:637
 #, c-format
 msgid "%u blocks per group, %u fragments per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:638
+#: misc/mke2fs.c:639
 #, c-format
 msgid "%u inodes per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:645
+#: misc/mke2fs.c:646
 #, c-format
 msgid "Superblock backups stored on blocks: "
 msgstr ""
 
-#: misc/mke2fs.c:724
+#: misc/mke2fs.c:725
 #, c-format
 msgid "Invalid stride parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:739
+#: misc/mke2fs.c:740
 #, c-format
 msgid "Invalid stripe-width parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:761
+#: misc/mke2fs.c:762
 #, c-format
 msgid "Invalid resize parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:768
+#: misc/mke2fs.c:769
 #, c-format
 msgid "The resize maximum must be greater than the filesystem size.\n"
 msgstr ""
 
-#: misc/mke2fs.c:792
+#: misc/mke2fs.c:793
 #, c-format
 msgid "On-line resizing not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:814
+#: misc/mke2fs.c:819
 #, c-format
 msgid ""
 "\n"
@@ -3821,10 +3826,12 @@ msgid ""
 "\tresize=<resize maximum size in blocks>\n"
 "\tlazy_itable_init=<0 to disable, 1 to enable>\n"
 "\ttest_fs\n"
+"\tdiscard\n"
+"\tnodiscard\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:830
+#: misc/mke2fs.c:837
 #, c-format
 msgid ""
 "\n"
@@ -3832,150 +3839,157 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:862
+#: misc/mke2fs.c:869
 #, c-format
 msgid ""
 "Syntax error in mke2fs config file (%s, line #%d)\n"
 "\t%s\n"
 msgstr ""
 
-#: misc/mke2fs.c:875 misc/tune2fs.c:355
+#: misc/mke2fs.c:882 misc/tune2fs.c:369
 #, c-format
 msgid "Invalid filesystem option set: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:985
+#: misc/mke2fs.c:992
 #, c-format
 msgid ""
 "\n"
 "Warning!  Your mke2fs.conf file does not define the %s filesystem type.\n"
 msgstr ""
 
-#: misc/mke2fs.c:988
+#: misc/mke2fs.c:995
 #, c-format
 msgid ""
 "You probably need to install an updated mke2fs.conf file.\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1224
+#: misc/mke2fs.c:1238
 #, c-format
 msgid "invalid block size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1228
+#: misc/mke2fs.c:1242
 #, c-format
 msgid "Warning: blocksize %d not usable on most systems.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1244
+#: misc/mke2fs.c:1258
 #, c-format
 msgid "invalid fragment size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1250
+#: misc/mke2fs.c:1264
 #, c-format
 msgid "Warning: fragments not supported.  Ignoring -f option\n"
 msgstr ""
 
-#: misc/mke2fs.c:1257
+#: misc/mke2fs.c:1271
 msgid "Illegal number for blocks per group"
 msgstr ""
 
-#: misc/mke2fs.c:1262
+#: misc/mke2fs.c:1276
 msgid "blocks per group must be multiple of 8"
 msgstr ""
 
-#: misc/mke2fs.c:1270
+#: misc/mke2fs.c:1284
 msgid "Illegal number for flex_bg size"
 msgstr ""
 
-#: misc/mke2fs.c:1276
+#: misc/mke2fs.c:1290
 msgid "flex_bg size must be a power of 2"
 msgstr ""
 
-#: misc/mke2fs.c:1286
+#: misc/mke2fs.c:1300
 #, c-format
 msgid "invalid inode ratio %s (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1306
+#: misc/mke2fs.c:1310
+#, 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:1324
 msgid "in malloc for bad_blocks_filename"
 msgstr ""
 
-#: misc/mke2fs.c:1316
+#: misc/mke2fs.c:1334
 #, c-format
 msgid "invalid reserved blocks percent - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1334
+#: misc/mke2fs.c:1352
 #, c-format
 msgid "bad revision level - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1346
+#: misc/mke2fs.c:1364
 #, c-format
 msgid "invalid inode size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1366
+#: misc/mke2fs.c:1384
 #, c-format
 msgid "bad num inodes - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1431 misc/mke2fs.c:2203
+#: misc/mke2fs.c:1449 misc/mke2fs.c:2259
 #, c-format
 msgid "while trying to open journal device %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1437
+#: misc/mke2fs.c:1455
 #, c-format
 msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1443
+#: misc/mke2fs.c:1461
 #, c-format
 msgid "Using journal device's blocksize: %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1452
+#: misc/mke2fs.c:1470
 #, c-format
 msgid "%d-byte blocks too big for system (max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1456
+#: misc/mke2fs.c:1474
 #, c-format
 msgid ""
 "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
 msgstr ""
 
-#: misc/mke2fs.c:1464
+#: misc/mke2fs.c:1483
 #, c-format
-msgid "invalid blocks count - %s"
+msgid "invalid blocks count '%s' on device '%s'"
 msgstr ""
 
-#: misc/mke2fs.c:1474
+#: misc/mke2fs.c:1493
 msgid "filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1510
+#: misc/mke2fs.c:1529
 #, c-format
 msgid ""
 "%s: Size of device %s too big to be expressed in 32 bits\n"
 "\tusing a blocksize of %d.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1519 resize/main.c:382
+#: misc/mke2fs.c:1538 resize/main.c:381
 msgid "while trying to determine filesystem size"
 msgstr ""
 
-#: misc/mke2fs.c:1526
+#: misc/mke2fs.c:1545
 msgid ""
 "Couldn't determine device size; you must specify\n"
 "the size of the filesystem\n"
 msgstr ""
 
-#: misc/mke2fs.c:1533
+#: misc/mke2fs.c:1552
 msgid ""
 "Device size reported to be zero.  Invalid partition specified, or\n"
 "\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3983,104 +3997,103 @@ msgid ""
 "\tto re-read your partition table.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1551
+#: misc/mke2fs.c:1570
 msgid "Filesystem larger than apparent device size."
 msgstr ""
 
-#: misc/mke2fs.c:1557
+#: misc/mke2fs.c:1576
 #, c-format
 msgid "Failed to parse fs types list\n"
 msgstr ""
 
-#: misc/mke2fs.c:1591
+#: misc/mke2fs.c:1610
 msgid "fs_types for mke2fs.conf resolution: "
 msgstr ""
 
-#: misc/mke2fs.c:1598
+#: misc/mke2fs.c:1617
 #, c-format
 msgid "Filesystem features not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1605
+#: misc/mke2fs.c:1624
 #, c-format
 msgid "Sparse superblocks not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1617
+#: misc/mke2fs.c:1636
 #, c-format
 msgid "Journals not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1635
+#: misc/mke2fs.c:1654
 #, 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:1652
+#: misc/mke2fs.c:1671
 msgid "while trying to determine hardware sector size"
 msgstr ""
 
-#: misc/mke2fs.c:1658
+#: misc/mke2fs.c:1677
 msgid "while trying to determine physical sector size"
 msgstr ""
 
-#: misc/mke2fs.c:1687
+#: misc/mke2fs.c:1708
 msgid "while setting blocksize; too small for device\n"
 msgstr ""
 
-#: misc/mke2fs.c:1691
+#: misc/mke2fs.c:1713
 #, c-format
 msgid ""
-"Warning: specified blocksize %d is less than device physical sectorsize %d, "
-"forced to continue\n"
+"Warning: specified blocksize %d is less than device physical sectorsize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1712
+#: misc/mke2fs.c:1733
 #, c-format
 msgid "warning: Unable to get device geometry for %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1715
+#: misc/mke2fs.c:1736
 #, c-format
 msgid "%s alignment is offset by %lu bytes.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1717
+#: misc/mke2fs.c:1738
 #, c-format
 msgid ""
 "This may result in very poor performance, (re)-partitioning suggested.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1745
+#: misc/mke2fs.c:1771
 msgid "reserved online resize blocks not supported on non-sparse filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1754
+#: misc/mke2fs.c:1780
 msgid "blocks per group count out of range"
 msgstr ""
 
-#: misc/mke2fs.c:1769
+#: misc/mke2fs.c:1795
 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
 msgstr ""
 
-#: misc/mke2fs.c:1781
+#: misc/mke2fs.c:1807
 #, c-format
 msgid "invalid inode size %d (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1795
+#: misc/mke2fs.c:1821
 #, c-format
 msgid "too many inodes (%llu), raise inode ratio?"
 msgstr ""
 
-#: misc/mke2fs.c:1800
+#: misc/mke2fs.c:1826
 #, c-format
 msgid "too many inodes (%llu), specify < 2^32 inodes"
 msgstr ""
 
-#: misc/mke2fs.c:1815
+#: misc/mke2fs.c:1841
 #, c-format
 msgid ""
 "inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4088,16 +4101,16 @@ msgid ""
 "\tor lower inode count (-N).\n"
 msgstr ""
 
-#: misc/mke2fs.c:1908 misc/tune2fs.c:1494
+#: misc/mke2fs.c:1934 misc/tune2fs.c:1544
 msgid "Couldn't allocate memory for tdb filename\n"
 msgstr ""
 
-#: misc/mke2fs.c:1921 misc/tune2fs.c:1516
+#: misc/mke2fs.c:1947 misc/tune2fs.c:1566
 #, c-format
 msgid "while trying to delete %s"
 msgstr ""
 
-#: misc/mke2fs.c:1931
+#: misc/mke2fs.c:1957
 #, c-format
 msgid ""
 "Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4105,87 +4118,92 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1968
+#: misc/mke2fs.c:1997
 #, c-format
 msgid "Calling BLKDISCARD from %llu to %llu "
 msgstr ""
 
-#: misc/mke2fs.c:1972
+#: misc/mke2fs.c:2001
 #, c-format
 msgid "failed.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1974
+#: misc/mke2fs.c:2003
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2023
+#: misc/mke2fs.c:2070
 msgid "while setting up superblock"
 msgstr ""
 
-#: misc/mke2fs.c:2087
+#: misc/mke2fs.c:2080
+#, c-format
+msgid "Discard succeeded and will return 0s  - skipping inode table wipe\n"
+msgstr ""
+
+#: misc/mke2fs.c:2143
 #, c-format
 msgid "unknown os - %s"
 msgstr ""
 
-#: misc/mke2fs.c:2141
+#: misc/mke2fs.c:2197
 msgid "while trying to allocate filesystem tables"
 msgstr ""
 
-#: misc/mke2fs.c:2172
+#: misc/mke2fs.c:2228
 #, c-format
 msgid "while zeroing block %u at end of filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:2185
+#: misc/mke2fs.c:2241
 msgid "while reserving blocks for online resize"
 msgstr ""
 
-#: misc/mke2fs.c:2196 misc/tune2fs.c:479
+#: misc/mke2fs.c:2252 misc/tune2fs.c:517
 msgid "journal"
 msgstr ""
 
-#: misc/mke2fs.c:2208
+#: misc/mke2fs.c:2264
 #, c-format
 msgid "Adding journal to device %s: "
 msgstr ""
 
-#: misc/mke2fs.c:2215
+#: misc/mke2fs.c:2271
 #, c-format
 msgid ""
 "\n"
 "\twhile trying to add journal to device %s"
 msgstr ""
 
-#: misc/mke2fs.c:2220 misc/mke2fs.c:2252 misc/tune2fs.c:508 misc/tune2fs.c:522
+#: misc/mke2fs.c:2276 misc/mke2fs.c:2308 misc/tune2fs.c:546 misc/tune2fs.c:560
 #, c-format
 msgid "done\n"
 msgstr ""
 
-#: misc/mke2fs.c:2229
+#: misc/mke2fs.c:2285
 #, c-format
 msgid "Skipping journal creation in super-only mode\n"
 msgstr ""
 
-#: misc/mke2fs.c:2240
+#: misc/mke2fs.c:2296
 #, c-format
 msgid "Creating journal (%u blocks): "
 msgstr ""
 
-#: misc/mke2fs.c:2257
+#: misc/mke2fs.c:2313
 #, c-format
 msgid "Writing superblocks and filesystem accounting information: "
 msgstr ""
 
-#: misc/mke2fs.c:2262
+#: misc/mke2fs.c:2318
 #, c-format
 msgid ""
 "\n"
 "Warning, had trouble writing out superblocks."
 msgstr ""
 
-#: misc/mke2fs.c:2265
+#: misc/mke2fs.c:2321
 #, c-format
 msgid ""
 "done\n"
@@ -4285,155 +4303,155 @@ msgstr ""
 msgid "Invalid mount option set: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:358
+#: misc/tune2fs.c:338
+#, c-format
+msgid "(and reboot afterwards!)\n"
+msgstr ""
+
+#: misc/tune2fs.c:372
 #, c-format
 msgid "Clearing filesystem feature '%s' not supported.\n"
 msgstr ""
 
-#: misc/tune2fs.c:364
+#: misc/tune2fs.c:378
 #, c-format
 msgid "Setting filesystem feature '%s' not supported.\n"
 msgstr ""
 
-#: misc/tune2fs.c:373
+#: misc/tune2fs.c:387
 msgid ""
 "The has_journal feature may only be cleared when the filesystem is\n"
 "unmounted or mounted read-only.\n"
 msgstr ""
 
-#: misc/tune2fs.c:381
+#: misc/tune2fs.c:395
 msgid ""
 "The needs_recovery flag is set.  Please run e2fsck before clearing\n"
 "the has_journal flag.\n"
 msgstr ""
 
-#: misc/tune2fs.c:414
+#: misc/tune2fs.c:428
 msgid ""
 "Clearing the flex_bg flag would cause the the filesystem to be\n"
 "inconsistent.\n"
 msgstr ""
 
-#: misc/tune2fs.c:425
+#: misc/tune2fs.c:439
 msgid ""
 "The huge_file feature may only be cleared when the filesystem is\n"
 "unmounted or mounted read-only.\n"
 msgstr ""
 
-#: misc/tune2fs.c:453
-#, c-format
-msgid "(and reboot afterwards!)\n"
-msgstr ""
-
-#: misc/tune2fs.c:474
+#: misc/tune2fs.c:512
 msgid "The filesystem already has a journal.\n"
 msgstr ""
 
-#: misc/tune2fs.c:492
+#: misc/tune2fs.c:530
 #, c-format
 msgid ""
 "\n"
 "\twhile trying to open journal on %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:496
+#: misc/tune2fs.c:534
 #, c-format
 msgid "Creating journal on device %s: "
 msgstr ""
 
-#: misc/tune2fs.c:504
+#: misc/tune2fs.c:542
 #, c-format
 msgid "while adding filesystem to journal on %s"
 msgstr ""
 
-#: misc/tune2fs.c:510
+#: misc/tune2fs.c:548
 msgid "Creating journal inode: "
 msgstr ""
 
-#: misc/tune2fs.c:519
+#: misc/tune2fs.c:557
 msgid ""
 "\n"
 "\twhile trying to create journal file"
 msgstr ""
 
-#: misc/tune2fs.c:585
+#: misc/tune2fs.c:623
 #, c-format
 msgid "Couldn't parse date/time specifier: %s"
 msgstr ""
 
-#: misc/tune2fs.c:609 misc/tune2fs.c:622
+#: misc/tune2fs.c:647 misc/tune2fs.c:660
 #, c-format
 msgid "bad mounts count - %s"
 msgstr ""
 
-#: misc/tune2fs.c:638
+#: misc/tune2fs.c:676
 #, c-format
 msgid "bad error behavior - %s"
 msgstr ""
 
-#: misc/tune2fs.c:665
+#: misc/tune2fs.c:703
 #, c-format
 msgid "bad gid/group name - %s"
 msgstr ""
 
-#: misc/tune2fs.c:698
+#: misc/tune2fs.c:736
 #, c-format
 msgid "bad interval - %s"
 msgstr ""
 
-#: misc/tune2fs.c:727
+#: misc/tune2fs.c:765
 #, c-format
 msgid "bad reserved block ratio - %s"
 msgstr ""
 
-#: misc/tune2fs.c:742
+#: misc/tune2fs.c:780
 msgid "-o may only be specified once"
 msgstr ""
 
-#: misc/tune2fs.c:752
+#: misc/tune2fs.c:790
 msgid "-O may only be specified once"
 msgstr ""
 
-#: misc/tune2fs.c:762
+#: misc/tune2fs.c:800
 #, c-format
 msgid "bad reserved blocks count - %s"
 msgstr ""
 
-#: misc/tune2fs.c:791
+#: misc/tune2fs.c:829
 #, c-format
 msgid "bad uid/user name - %s"
 msgstr ""
 
-#: misc/tune2fs.c:808
+#: misc/tune2fs.c:846
 #, c-format
 msgid "bad inode size - %s"
 msgstr ""
 
-#: misc/tune2fs.c:815
+#: misc/tune2fs.c:853
 #, c-format
 msgid "Inode size must be a power of two- %s"
 msgstr ""
 
-#: misc/tune2fs.c:904
+#: misc/tune2fs.c:942
 #, c-format
 msgid "Invalid RAID stride: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:919
+#: misc/tune2fs.c:957
 #, c-format
 msgid "Invalid RAID stripe-width: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:934
+#: misc/tune2fs.c:972
 #, c-format
 msgid "Invalid hash algorithm: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:940
+#: misc/tune2fs.c:978
 #, c-format
 msgid "Setting default hash algorithm to %s (%d)\n"
 msgstr ""
 
-#: misc/tune2fs.c:948
+#: misc/tune2fs.c:998
 #, c-format
 msgid ""
 "\n"
@@ -4450,29 +4468,29 @@ msgid ""
 "\t^test_fs\n"
 msgstr ""
 
-#: misc/tune2fs.c:1421 resize/resize2fs.c:790
+#: misc/tune2fs.c:1471 resize/resize2fs.c:790
 msgid "blocks to be moved"
 msgstr ""
 
-#: misc/tune2fs.c:1424
+#: misc/tune2fs.c:1474
 msgid "Failed to allocate block bitmap when increasing inode size\n"
 msgstr ""
 
-#: misc/tune2fs.c:1430
+#: misc/tune2fs.c:1480
 msgid "Not enough space to increase inode size \n"
 msgstr ""
 
-#: misc/tune2fs.c:1435
+#: misc/tune2fs.c:1485
 msgid "Failed to relocate blocks during inode resize \n"
 msgstr ""
 
-#: misc/tune2fs.c:1467
+#: misc/tune2fs.c:1517
 msgid ""
 "Error in resizing the inode size.\n"
 "Run e2undo to undo the file system changes. \n"
 msgstr ""
 
-#: misc/tune2fs.c:1526
+#: misc/tune2fs.c:1576
 #, c-format
 msgid ""
 "To undo the tune2fs operation please run the command\n"
@@ -4480,110 +4498,110 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/tune2fs.c:1587
+#: misc/tune2fs.c:1637
 #, c-format
 msgid "The inode size is already %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1592
+#: misc/tune2fs.c:1642
 #, c-format
 msgid "Shrinking the inode size is not supported\n"
 msgstr ""
 
-#: misc/tune2fs.c:1635
+#: misc/tune2fs.c:1685
 #, c-format
 msgid "Setting maximal mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1641
+#: misc/tune2fs.c:1691
 #, c-format
 msgid "Setting current mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1646
+#: misc/tune2fs.c:1696
 #, c-format
 msgid "Setting error behavior to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1651
+#: misc/tune2fs.c:1701
 #, c-format
 msgid "Setting reserved blocks gid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1656
+#: misc/tune2fs.c:1706
 #, c-format
 msgid "Setting interval between checks to %lu seconds\n"
 msgstr ""
 
-#: misc/tune2fs.c:1663
+#: misc/tune2fs.c:1713
 #, c-format
 msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
 msgstr ""
 
-#: misc/tune2fs.c:1670
+#: misc/tune2fs.c:1720
 #, c-format
 msgid "reserved blocks count is too big (%lu)"
 msgstr ""
 
-#: misc/tune2fs.c:1676
+#: misc/tune2fs.c:1726
 #, c-format
 msgid "Setting reserved blocks count to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1682
+#: misc/tune2fs.c:1732
 msgid ""
 "\n"
 "The filesystem already has sparse superblocks.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1689
+#: misc/tune2fs.c:1739
 #, c-format
 msgid ""
 "\n"
 "Sparse superblock flag set.  %s"
 msgstr ""
 
-#: misc/tune2fs.c:1694
+#: misc/tune2fs.c:1744
 msgid ""
 "\n"
 "Clearing the sparse superflag not supported.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1701
+#: misc/tune2fs.c:1751
 #, c-format
 msgid "Setting time filesystem last checked to %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:1707
+#: misc/tune2fs.c:1757
 #, c-format
 msgid "Setting reserved blocks uid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1758
+#: misc/tune2fs.c:1808
 msgid "Invalid UUID format\n"
 msgstr ""
 
-#: misc/tune2fs.c:1770
+#: misc/tune2fs.c:1820
 msgid "The inode size may only be changed when the filesystem is unmounted.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1777
+#: misc/tune2fs.c:1827
 msgid ""
 "Changing the inode size not supported for filesystems with the flex_bg\n"
 "feature enabled.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1789
+#: misc/tune2fs.c:1839
 #, c-format
 msgid "Setting inode size %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1799
+#: misc/tune2fs.c:1849
 #, c-format
 msgid "Setting stride size to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1804
+#: misc/tune2fs.c:1854
 #, c-format
 msgid "Setting stripe width to %d\n"
 msgstr ""
@@ -4685,16 +4703,16 @@ msgstr ""
 msgid "Usage: %s [-r] [-t]\n"
 msgstr ""
 
-#: resize/extent.c:196
+#: resize/extent.c:201
 msgid "# Extent dump:\n"
 msgstr ""
 
-#: resize/extent.c:197
+#: resize/extent.c:202
 #, c-format
 msgid "#\tNum=%d, Size=%d, Cursor=%d, Sorted=%d\n"
 msgstr ""
 
-#: resize/extent.c:200
+#: resize/extent.c:205
 #, c-format
 msgid "#\t\t %u -> %u (%d)\n"
 msgstr ""
@@ -4752,33 +4770,33 @@ msgid ""
 "\t!resize_inode features is not supported by resize2fs.\n"
 msgstr ""
 
-#: resize/main.c:352 resize/main.c:452
+#: resize/main.c:351 resize/main.c:451
 #, c-format
 msgid ""
 "Please run 'e2fsck -f %s' first.\n"
 "\n"
 msgstr ""
 
-#: resize/main.c:356
+#: resize/main.c:355
 #, c-format
 msgid "Estimated minimum size of the filesystem: %u\n"
 msgstr ""
 
-#: resize/main.c:392
+#: resize/main.c:391
 #, c-format
 msgid "Invalid new size: %s\n"
 msgstr ""
 
-#: resize/main.c:404
+#: resize/main.c:403
 #, c-format
 msgid "New size smaller than minimum (%u)\n"
 msgstr ""
 
-#: resize/main.c:410
+#: resize/main.c:409
 msgid "Invalid stride length"
 msgstr ""
 
-#: resize/main.c:434
+#: resize/main.c:433
 #, c-format
 msgid ""
 "The containing partition (or device) is only %u (%dk) blocks.\n"
@@ -4786,38 +4804,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: resize/main.c:441
+#: resize/main.c:440
 #, c-format
 msgid ""
 "The filesystem is already %u blocks long.  Nothing to do!\n"
 "\n"
 msgstr ""
 
-#: resize/main.c:456
+#: resize/main.c:455
 #, c-format
 msgid "Resizing the filesystem on %s to %u (%dk) blocks.\n"
 msgstr ""
 
-#: resize/main.c:465
+#: resize/main.c:464
 #, c-format
 msgid "while trying to resize %s"
 msgstr ""
 
-#: resize/main.c:468
+#: resize/main.c:467
 #, c-format
 msgid ""
 "Please run 'e2fsck -fy %s' to fix the filesystem\n"
 "after the aborted resize operation.\n"
 msgstr ""
 
-#: resize/main.c:474
+#: resize/main.c:473
 #, c-format
 msgid ""
 "The filesystem on %s is now %u blocks long.\n"
 "\n"
 msgstr ""
 
-#: resize/main.c:489
+#: resize/main.c:488
 #, c-format
 msgid "while trying to truncate %s"
 msgstr ""
diff --git a/version.h b/version.h
index fe0884d..0469319 100644
--- a/version.h
+++ b/version.h
@@ -7,5 +7,5 @@
  * file may be redistributed under the GNU Public License v2.
  */
 
-#define E2FSPROGS_VERSION "1.41.12"
-#define E2FSPROGS_DATE "17-May-2010"
+#define E2FSPROGS_VERSION "1.41.13"
+#define E2FSPROGS_DATE "22-Nov-2010"
-- 
1.8.3.1