Update release notes, etc., for the 1.45.6 release

Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/README b/README
index 75cd2fc13ccadc1eaf0fc31f2cb7a9f26ca9ee64..3304a4d98e253141ee2bf73b0bcea30e7fb30b5b 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-       This is the new version (1.45.5) of the second extended file
+       This is the new version (1.45.6) 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 df49682243c00acf40bcc0f894520fae6eba0dd1..9387cc6db87b146cd6ba3734e2ebc1fd5fea60f3 120000 (symlink)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1 +1 @@
-doc/RelNotes/v1.45.5.txt
\ No newline at end of file
+doc/RelNotes/v1.45.6.txt
\ No newline at end of file

diff --git a/debian/changelog b/debian/changelog
index bf82d154bad854428684fae015bdde883f37527e..c11767d83ef97ba1baa8ca3bbb493b82f5d5c975 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+e2fsprogs (1.45.6-1) unstable; urgency=medium
+
+  * New upstream release
+  * Fixed a number of potential out of bounds memory accesses caused by
+    fuzzed / malicious file systems.
+  * Fix a spurious complaint from e2fsck when a directory which previously
+    had more than 32000 subdirectories has the number of subdirectories
+    drops below 32000.
+  * Improve e2fsck's ability to deal with file systems with a *very* large
+    number of directories.
+  * Debugfs will ignore lines in its command files which start with a
+    comment character ("#").
+  * Fix debugfs so it correctly prints inode numbers > 2**31.
+  * Filefrag now supports very large files (with > 4 billion blocks), as
+    well as block sizes up to 1 GiB.
+  * Mke2fs -d now correctly sets permission with files where the owner
+    permissions are not rwx.
+  * Updated and clarified various man pages
+    (Closes: #953493, #953494, #951808)
+  * Drop as unneeded libattr1-dev as a build dependency (Closes: #953926)
+  * Update the Malay translation from the translation project.
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Fri, 20 Mar 2020 23:49:33 -0400
+
 e2fsprogs (1.45.5-2) unstable; urgency=medium
 
   * Fix com_err support on Hurd, which has POSIX E* error code starting at
@@ -9,7 +33,7 @@ e2fsprogs (1.45.5-2) unstable; urgency=medium
 
 e2fsprogs (1.45.5-1) unstable; urgency=medium
 
-  * New upstream feature
+  * New upstream release
   * E2fsck will no longer force a full file system check if time-based
     forced checks are disabled and the last mount time or last write time in
     the superblock are in the future.

diff --git a/debian/libext2fs2.symbols b/debian/libext2fs2.symbols
index 3645c67b49ff0339750999c57dfd30f616360099..a03d3a995d1067d61331eae130ad2f86b19ed40f 100644 (file)
--- a/debian/libext2fs2.symbols
+++ b/debian/libext2fs2.symbols
@@ -6,6 +6,7 @@ libe2p.so.2 libext2fs2 #MINVER#
  e2p_encmode2string@Base 1.43
  e2p_encoding2str@Base 1.45.1
  e2p_feature2string@Base 1.37
+ e2p_feature_to_string@Base 1.45.6
  e2p_get_encoding_flags@Base 1.45
  e2p_hash2string@Base 1.37
  e2p_is_null_uuid@Base 1.37
@@ -479,6 +480,7 @@ libext2fs.so.2 libext2fs2 #MINVER#
  ext2fs_read_inode_full@Base 1.37
  ext2fs_remove_exit_fn@Base 1.43
  ext2fs_reserve_super_and_bgd@Base 1.37
+ ext2fs_resize_array@Base 1.45.6
  ext2fs_resize_block_bitmap2@Base 1.42
  ext2fs_resize_block_bitmap@Base 1.37
  ext2fs_resize_generic_bitmap@Base 1.37

diff --git a/doc/RelNotes/v1.45.6.txt b/doc/RelNotes/v1.45.6.txt
new file mode 100644 (file)
index 0000000..ac822bf
--- /dev/null
+++ b/doc/RelNotes/v1.45.6.txt
@@ -0,0 +1,62 @@
+E2fsprogs 1.45.6 (March 20, 2020)
+==================================
+
+Updates/Fixes since v1.45.5:
+
+UI and Features
+---------------
+
+Debugfs will ignore lines in its command files which start with a
+comment character ("#").
+
+
+Fixes
+-----
+
+Fixed a number of potential out of bounds memory accesses caused by
+fuzzed / malicious file systems.  (Addresses Google Bug: #147849134)
+
+Fix a spurious complaint from e2fsck when a directory which previously
+had more than 32000 subdirectories has the number of subdirectories
+drops below 32000.
+
+Fix an ismounted check when an LVM device is renamed while the device is
+mounted.
+
+Mke2fs -d now correctly sets permission with files where the owner
+permissions are not rwx.
+
+Improve e2fsck's ability to deal with file systems with very large
+number of directories, such that various data structures take more than
+2GiB of memory.  Use better structure packing to improve the memory
+efficiency of these data structures.
+
+Fix debugfs so it correctly prints inode numbers > 2**31.
+
+Filefrag now supports very large files (with > 4 billion blocks), as
+well as block sizes up to 1 GiB.
+
+Updated and clarified various man pages.  (Addresses Debian Bugs:
+#953493, #953494, #951808)
+
+
+
+Performance, Internal Implementation, Development Support etc.
+--------------------------------------------------------------
+
+Reserved the error code EXT2_ET_NO_GDESC (which will be used in
+e2fsprogs v1.46+)
+
+Added a thread-safe variant of e2p_feature2string(),
+e2p_feature_to_string() to the libe2p library.
+
+Fixed portability problems caused by gcc 10.
+
+Fixed portability problem in libcom_err with GNU Hurd.
+
+Fixed various Debian packaging issues.  (Addresses-Debian-Bug: #953926)
+
+Synchronized changes from Android's AOSP e2fsprogs tree.
+
+Update the Malay translation from the translation project.
+

diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 3ad28efa02be96a8da81d4c3f944a4462b7980df..51012eb631b962e81bfeb7768ece053271def319 100644 (file)
--- 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.45.5)
+@settitle The EXT2FS Library (version 1.45.6)
 @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.45.5
-@subtitle January 2020
+@subtitle Version 1.45.6
+@subtitle March 2020
 
 @author by Theodore Ts'o
 
@@ -101,7 +101,7 @@ by the Foundation.
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.45.5.
+This manual documents the EXT2FS Library, version 1.45.6.
 
 @menu
 * Introduction to the EXT2FS Library::  

diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index e90b44e9328273e40260e6ba74f77d63c93e37aa..fe9d65e7b9d7bc48c503073aa76269c89ae493e6 100644 (file)
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.45.5
-Entered-date:   2020-01-07
+Version:        1.45.6
+Entered-date:   2020-03-20
 Description:    The filesystem utilities for the EXT2, EXT3, and EXT4
                filesystems, including e2fsck, mke2fs, dumpe2fs, and others.
 Keywords:       utilities, filesystem, Ext2fs, ext3, ext4
 Author:         tytso@mit.edu (Theodore Tso)
 Maintained-by:  tytso@mit.edu (Theodore Tso)
 Primary-site:   ftp.kernel.org /pub/linux/kernel/people/tytso/e2fsprogs
-                7756kB e2fsprogs-1.45.5.tar.gz
-                1kB    e2fsprogs-1.45.5.lsm
+                7756kB e2fsprogs-1.45.6.tar.gz
+                1kB    e2fsprogs-1.45.6.lsm
 Alternate-site: download.sourceforge.net /pub/sourceforge/e2fsprogs
 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/3.x/4.x
 Copying-policy: GPL-2/LGPL-2

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index ca35cc270c114f62fa0833537a0bf68bc717b08f..7026601bb95f2bd14b1b684940e5c6b1d0897d2d 100644 (file)
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -5,7 +5,7 @@
 
 Summary: Utilities for managing ext2/ext3/ext4 filesystems
 Name: e2fsprogs
-Version: 1.45.4
+Version: 1.45.6
 Release: 0
 License: GPLv2
 Group: System Environment/Base

diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index 0ad3b291f83b77cd319ffea08d34a4da23d439ab..a5c9115eed98a20d4558f19f8300c15db8e557c4 100644 (file)
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -77,9 +77,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: e2fsprogs v1.45.5\n"
+"Project-Id-Version: e2fsprogs v1.45.6\n"
 "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
-"POT-Creation-Date: 2020-01-05 23:49-0500\n"
+"POT-Creation-Date: 2020-03-20 23:47-0400\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"
@@ -105,7 +105,7 @@ msgstr ""
 #: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1571
 #: e2fsck/unix.c:1685 misc/badblocks.c:1251 misc/badblocks.c:1259
 #: misc/badblocks.c:1273 misc/badblocks.c:1285 misc/dumpe2fs.c:431
-#: misc/dumpe2fs.c:688 misc/dumpe2fs.c:692 misc/e2image.c:1430
+#: misc/dumpe2fs.c:692 misc/dumpe2fs.c:696 misc/e2image.c:1430
 #: misc/e2image.c:1627 misc/e2image.c:1648 misc/mke2fs.c:236
 #: misc/tune2fs.c:2808 misc/tune2fs.c:2907 resize/main.c:414
 #, c-format
@@ -130,7 +130,7 @@ msgstr ""
 msgid "Warning: illegal block %u found in bad block inode.  Cleared.\n"
 msgstr ""
 
-#: e2fsck/dirinfo.c:331
+#: e2fsck/dirinfo.c:332
 msgid "while freeing dir_info tdb file"
 msgstr ""
 
@@ -162,15 +162,15 @@ msgstr ""
 msgid "Error writing block %lu (%s).  "
 msgstr ""
 
-#: e2fsck/emptydir.c:57
+#: e2fsck/emptydir.c:56
 msgid "empty dirblocks"
 msgstr ""
 
-#: e2fsck/emptydir.c:62
+#: e2fsck/emptydir.c:61
 msgid "empty dir map"
 msgstr ""
 
-#: e2fsck/emptydir.c:98
+#: e2fsck/emptydir.c:97
 #, c-format
 msgid "Empty directory block %u (#%d) in inode %u\n"
 msgstr ""
@@ -180,12 +180,12 @@ msgstr ""
 msgid "%s: %s filename nblocks blocksize\n"
 msgstr ""
 
-#: e2fsck/extend.c:44
+#: e2fsck/extend.c:45
 #, c-format
 msgid "Illegal number of blocks!\n"
 msgstr ""
 
-#: e2fsck/extend.c:50
+#: e2fsck/extend.c:51
 #, c-format
 msgid "Couldn't allocate block buffer (size=%d)\n"
 msgstr ""
@@ -527,7 +527,7 @@ msgstr ""
 msgid "while hashing entry with e_value_inum = %u"
 msgstr ""
 
-#: e2fsck/pass1.c:775 e2fsck/pass2.c:1009
+#: e2fsck/pass1.c:775 e2fsck/pass2.c:1010
 msgid "reading directory block"
 msgstr ""
 
@@ -605,11 +605,11 @@ msgstr ""
 msgid "inode table"
 msgstr ""
 
-#: e2fsck/pass2.c:307
+#: e2fsck/pass2.c:308
 msgid "Pass 2"
 msgstr ""
 
-#: e2fsck/pass2.c:1082 e2fsck/pass2.c:1249
+#: e2fsck/pass2.c:1083 e2fsck/pass2.c:1250
 msgid "Can not continue."
 msgstr ""
 
@@ -629,7 +629,7 @@ msgstr ""
 msgid "inode loop detection bitmap"
 msgstr ""
 
-#: e2fsck/pass4.c:277
+#: e2fsck/pass4.c:289
 msgid "Pass 4"
 msgstr ""
 
@@ -2759,57 +2759,62 @@ msgstr ""
 msgid "@d exceeds max links, but no DIR_NLINK feature in @S.\n"
 msgstr ""
 
-#: e2fsck/problem.c:2016
+#: e2fsck/problem.c:2014
+#. @-expanded: directory inode %i ref count set to overflow but could be exact value %N.  
+msgid "@d @i %i ref count set to overflow but could be exact value %N.  "
+msgstr ""
+
+#: e2fsck/problem.c:2021
 #. @-expanded: Pass 5: Checking group summary information\n
 msgid "Pass 5: Checking @g summary information\n"
 msgstr ""
 
-#: e2fsck/problem.c:2021
+#: e2fsck/problem.c:2026
 #. @-expanded: Padding at end of inode bitmap is not set. 
 msgid "Padding at end of @i @B is not set. "
 msgstr ""
 
-#: e2fsck/problem.c:2026
+#: e2fsck/problem.c:2031
 #. @-expanded: Padding at end of block bitmap is not set. 
 msgid "Padding at end of @b @B is not set. "
 msgstr ""
 
-#: e2fsck/problem.c:2031
+#: e2fsck/problem.c:2036
 #. @-expanded: block bitmap differences: 
 msgid "@b @B differences: "
 msgstr ""
 
-#: e2fsck/problem.c:2053
+#: e2fsck/problem.c:2058
 #. @-expanded: inode bitmap differences: 
 msgid "@i @B differences: "
 msgstr ""
 
-#: e2fsck/problem.c:2075
+#: e2fsck/problem.c:2080
 #. @-expanded: Free inodes count wrong for group #%g (%i, counted=%j).\n
 msgid "Free @is count wrong for @g #%g (%i, counted=%j).\n"
 msgstr ""
 
-#: e2fsck/problem.c:2080
+#: e2fsck/problem.c:2085
 #. @-expanded: Directories count wrong for group #%g (%i, counted=%j).\n
 msgid "Directories count wrong for @g #%g (%i, counted=%j).\n"
 msgstr ""
 
-#: e2fsck/problem.c:2085
+#: e2fsck/problem.c:2090
 #. @-expanded: Free inodes count wrong (%i, counted=%j).\n
 msgid "Free @is count wrong (%i, counted=%j).\n"
 msgstr ""
 
-#: e2fsck/problem.c:2090
+#: e2fsck/problem.c:2095
 #. @-expanded: Free blocks count wrong for group #%g (%b, counted=%c).\n
 msgid "Free @bs count wrong for @g #%g (%b, counted=%c).\n"
 msgstr ""
 
-#: e2fsck/problem.c:2095
+#: e2fsck/problem.c:2100
 #. @-expanded: Free blocks count wrong (%b, counted=%c).\n
 msgid "Free @bs count wrong (%b, counted=%c).\n"
 msgstr ""
 
-#: e2fsck/problem.c:2100
+#: e2fsck/problem.c:2105
 #. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap 
 #. @-expanded: endpoints (%i, %j)\n
 msgid ""
@@ -2817,81 +2822,81 @@ msgid ""
 "endpoints (%i, %j)\n"
 msgstr ""
 
-#: e2fsck/problem.c:2106
+#: e2fsck/problem.c:2111
 msgid "Internal error: fudging end of bitmap (%N)\n"
 msgstr ""
 
-#: e2fsck/problem.c:2112
+#: e2fsck/problem.c:2117
 #, no-c-format
 #. @-expanded: Error copying in replacement inode bitmap: %m\n
 msgid "Error copying in replacement @i @B: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:2118
+#: e2fsck/problem.c:2123
 #, no-c-format
 #. @-expanded: Error copying in replacement block bitmap: %m\n
 msgid "Error copying in replacement @b @B: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:2148
+#: e2fsck/problem.c:2153
 #, no-c-format
 #. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n
 msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n"
 msgstr ""
 
-#: e2fsck/problem.c:2154
+#: e2fsck/problem.c:2159
 #, no-c-format
 #. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n
 msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n"
 msgstr ""
 
-#: e2fsck/problem.c:2160
+#: e2fsck/problem.c:2165
 #, no-c-format
 #. @-expanded: group %g inode bitmap does not match checksum.\n
 msgid "@g %g @i @B does not match checksum.\n"
 msgstr ""
 
-#: e2fsck/problem.c:2166
+#: e2fsck/problem.c:2171
 #, no-c-format
 #. @-expanded: group %g block bitmap does not match checksum.\n
 msgid "@g %g @b @B does not match checksum.\n"
 msgstr ""
 
-#: e2fsck/problem.c:2173
+#: e2fsck/problem.c:2178
 #. @-expanded: Recreate journal
 msgid "Recreate @j"
 msgstr ""
 
-#: e2fsck/problem.c:2178
+#: e2fsck/problem.c:2183
 msgid "Update quota info for quota type %N"
 msgstr ""
 
-#: e2fsck/problem.c:2184
+#: e2fsck/problem.c:2189
 #, no-c-format
 #. @-expanded: Error setting block group checksum info: %m\n
 msgid "Error setting @b @g checksum info: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:2190
+#: e2fsck/problem.c:2195
 #, no-c-format
 msgid "Error writing file system info: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:2196
+#: e2fsck/problem.c:2201
 #, no-c-format
 msgid "Error flushing writes to storage device: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:2201
+#: e2fsck/problem.c:2206
 msgid "Error writing quota info for quota type %N: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:2364
+#: e2fsck/problem.c:2369
 #, c-format
 msgid "Unhandled error code (0x%x)!\n"
 msgstr ""
 
-#: e2fsck/problem.c:2494 e2fsck/problem.c:2498
+#: e2fsck/problem.c:2499 e2fsck/problem.c:2503
 msgid "IGNORED"
 msgstr ""
 
@@ -2901,7 +2906,7 @@ msgstr ""
 
 #: e2fsck/scantest.c:79
 #, c-format
-msgid "Memory used: %d, elapsed time: %6.3f/%6.3f/%6.3f\n"
+msgid "Memory used: %lu, elapsed time: %6.3f/%6.3f/%6.3f\n"
 msgstr ""
 
 #: e2fsck/scantest.c:98
@@ -3100,7 +3105,7 @@ msgid_plural "%12u files\n"
 msgstr[0] ""
 msgstr[1] ""
 
-#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2998 misc/util.c:129
+#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2997 misc/util.c:129
 #: resize/main.c:354
 #, c-format
 msgid "while determining whether %s is mounted."
@@ -3328,7 +3333,7 @@ msgid "while reading MMP block"
 msgstr ""
 
 #: e2fsck/unix.c:1302 e2fsck/unix.c:1354 misc/e2undo.c:236 misc/e2undo.c:281
-#: misc/mke2fs.c:2696 misc/mke2fs.c:2747 misc/tune2fs.c:2725
+#: misc/mke2fs.c:2694 misc/mke2fs.c:2745 misc/tune2fs.c:2725
 #: misc/tune2fs.c:2770 resize/main.c:188 resize/main.c:233
 #, c-format
 msgid ""
@@ -3337,13 +3342,13 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2736 misc/tune2fs.c:2759
+#: e2fsck/unix.c:1343 misc/e2undo.c:270 misc/mke2fs.c:2734 misc/tune2fs.c:2759
 #: resize/main.c:222
 #, c-format
 msgid "while trying to delete %s"
 msgstr ""
 
-#: e2fsck/unix.c:1369 misc/mke2fs.c:2762 resize/main.c:243
+#: e2fsck/unix.c:1369 misc/mke2fs.c:2760 resize/main.c:243
 msgid "while trying to setup undo file\n"
 msgstr ""
 
@@ -3430,117 +3435,117 @@ msgstr ""
 msgid "Get a newer version of e2fsck!"
 msgstr ""
 
-#: e2fsck/unix.c:1749
+#: e2fsck/unix.c:1748
 #, c-format
 msgid "while checking journal for %s"
 msgstr ""
 
-#: e2fsck/unix.c:1752
+#: e2fsck/unix.c:1751
 msgid "Cannot proceed with file system check"
 msgstr ""
 
-#: e2fsck/unix.c:1763
+#: e2fsck/unix.c:1762
 msgid ""
 "Warning: skipping journal recovery because doing a read-only filesystem "
 "check.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1775
+#: e2fsck/unix.c:1774
 #, c-format
 msgid "unable to set superblock flags on %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1781
+#: e2fsck/unix.c:1780
 #, c-format
 msgid "Journal checksum error found in %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1785
+#: e2fsck/unix.c:1784
 #, c-format
 msgid "Journal corrupted in %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1789
+#: e2fsck/unix.c:1788
 #, c-format
 msgid "while recovering journal of %s"
 msgstr ""
 
-#: e2fsck/unix.c:1811
+#: e2fsck/unix.c:1810
 #, c-format
 msgid "%s has unsupported feature(s):"
 msgstr ""
 
-#: e2fsck/unix.c:1826
+#: e2fsck/unix.c:1825
 #, c-format
 msgid "%s has unsupported encoding: %0x\n"
 msgstr ""
 
-#: e2fsck/unix.c:1876
+#: e2fsck/unix.c:1875
 #, c-format
 msgid "%s: %s while reading bad blocks inode\n"
 msgstr ""
 
-#: e2fsck/unix.c:1879
+#: e2fsck/unix.c:1878
 msgid "This doesn't bode well, but we'll try to go on...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1919
+#: e2fsck/unix.c:1918
 #, c-format
 msgid "Creating journal (%d blocks): "
 msgstr ""
 
-#: e2fsck/unix.c:1929
+#: e2fsck/unix.c:1928
 msgid " Done.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1931
+#: e2fsck/unix.c:1930
 msgid ""
 "\n"
 "*** journal has been regenerated ***\n"
 msgstr ""
 
-#: e2fsck/unix.c:1937
+#: e2fsck/unix.c:1936
 msgid "aborted"
 msgstr ""
 
-#: e2fsck/unix.c:1939
+#: e2fsck/unix.c:1938
 #, c-format
 msgid "%s: e2fsck canceled.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1966
+#: e2fsck/unix.c:1965
 msgid "Restarting e2fsck from the beginning...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1970
+#: e2fsck/unix.c:1969
 msgid "while resetting context"
 msgstr ""
 
-#: e2fsck/unix.c:2029
+#: e2fsck/unix.c:2028
 #, c-format
 msgid ""
 "\n"
 "%s: ***** FILE SYSTEM ERRORS CORRECTED *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:2031
+#: e2fsck/unix.c:2030
 #, c-format
 msgid "%s: File system was modified.\n"
 msgstr ""
 
-#: e2fsck/unix.c:2035 e2fsck/util.c:71
+#: e2fsck/unix.c:2034 e2fsck/util.c:71
 #, c-format
 msgid ""
 "\n"
 "%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:2040
+#: e2fsck/unix.c:2039
 #, c-format
 msgid "%s: ***** REBOOT SYSTEM *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:2050 e2fsck/util.c:77
+#: e2fsck/unix.c:2049 e2fsck/util.c:77
 #, c-format
 msgid ""
 "\n"
@@ -3548,96 +3553,96 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/util.c:196 misc/util.c:93
+#: e2fsck/util.c:195 misc/util.c:93
 msgid "yY"
 msgstr ""
 
-#: e2fsck/util.c:197 misc/util.c:112
+#: e2fsck/util.c:196 misc/util.c:112
 msgid "nN"
 msgstr ""
 
-#: e2fsck/util.c:198
+#: e2fsck/util.c:197
 msgid "aA"
 msgstr ""
 
-#: e2fsck/util.c:202
+#: e2fsck/util.c:201
 msgid " ('a' enables 'yes' to all) "
 msgstr ""
 
-#: e2fsck/util.c:219
+#: e2fsck/util.c:218
 msgid "<y>"
 msgstr ""
 
-#: e2fsck/util.c:221
+#: e2fsck/util.c:220
 msgid "<n>"
 msgstr ""
 
-#: e2fsck/util.c:223
+#: e2fsck/util.c:222
 msgid " (y/n)"
 msgstr ""
 
-#: e2fsck/util.c:246
+#: e2fsck/util.c:245
 msgid "cancelled!\n"
 msgstr ""
 
-#: e2fsck/util.c:279
+#: e2fsck/util.c:278
 msgid "yes to all\n"
 msgstr ""
 
-#: e2fsck/util.c:281
+#: e2fsck/util.c:280
 msgid "yes\n"
 msgstr ""
 
-#: e2fsck/util.c:283
+#: e2fsck/util.c:282
 msgid "no\n"
 msgstr ""
 
-#: e2fsck/util.c:293
+#: e2fsck/util.c:292
 #, c-format
 msgid ""
 "%s? no\n"
 "\n"
 msgstr ""
 
-#: e2fsck/util.c:297
+#: e2fsck/util.c:296
 #, c-format
 msgid ""
 "%s? yes\n"
 "\n"
 msgstr ""
 
-#: e2fsck/util.c:301
+#: e2fsck/util.c:300
 msgid "yes"
 msgstr ""
 
-#: e2fsck/util.c:301
+#: e2fsck/util.c:300
 msgid "no"
 msgstr ""
 
-#: e2fsck/util.c:317
+#: e2fsck/util.c:316
 #, c-format
 msgid "e2fsck_read_bitmaps: illegal bitmap block(s) for %s"
 msgstr ""
 
-#: e2fsck/util.c:322
+#: e2fsck/util.c:321
 msgid "reading inode and block bitmaps"
 msgstr ""
 
-#: e2fsck/util.c:334
+#: e2fsck/util.c:333
 #, c-format
 msgid "while retrying to read bitmaps for %s"
 msgstr ""
 
-#: e2fsck/util.c:346
+#: e2fsck/util.c:345
 msgid "writing block and inode bitmaps"
 msgstr ""
 
-#: e2fsck/util.c:351
+#: e2fsck/util.c:350
 #, c-format
 msgid "while rewriting block and inode bitmaps for %s"
 msgstr ""
 
-#: e2fsck/util.c:363
+#: e2fsck/util.c:362
 #, c-format
 msgid ""
 "\n"
@@ -3646,37 +3651,37 @@ msgid ""
 "\t(i.e., without -a or -p options)\n"
 msgstr ""
 
-#: e2fsck/util.c:444
+#: e2fsck/util.c:442
 #, c-format
-msgid "Memory used: %luk/%luk (%luk/%luk), "
+msgid "Memory used: %lluk/%lluk (%lluk/%lluk), "
 msgstr ""
 
 #: e2fsck/util.c:448
 #, c-format
-msgid "Memory used: %lu, "
+msgid "Memory used: %lluk, "
 msgstr ""
 
-#: e2fsck/util.c:455
+#: e2fsck/util.c:454
 #, c-format
 msgid "time: %5.2f/%5.2f/%5.2f\n"
 msgstr ""
 
-#: e2fsck/util.c:460
+#: e2fsck/util.c:459
 #, c-format
 msgid "elapsed time: %6.3f\n"
 msgstr ""
 
-#: e2fsck/util.c:495 e2fsck/util.c:509
+#: e2fsck/util.c:494 e2fsck/util.c:508
 #, c-format
 msgid "while reading inode %lu in %s"
 msgstr ""
 
-#: e2fsck/util.c:523 e2fsck/util.c:536
+#: e2fsck/util.c:522 e2fsck/util.c:535
 #, c-format
 msgid "while writing inode %lu in %s"
 msgstr ""
 
-#: e2fsck/util.c:792
+#: e2fsck/util.c:793
 msgid ""
 "UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is "
 "running.\n"
@@ -4234,30 +4239,30 @@ msgstr ""
 msgid "Couldn't find journal superblock magic numbers"
 msgstr ""
 
-#: misc/dumpe2fs.c:468
+#: misc/dumpe2fs.c:470
 msgid "failed to alloc MMP buffer\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:479
+#: misc/dumpe2fs.c:481
 #, c-format
 msgid "reading MMP block %llu from '%s'\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:507 misc/mke2fs.c:800 misc/tune2fs.c:2039
+#: misc/dumpe2fs.c:511 misc/mke2fs.c:798 misc/tune2fs.c:2039
 msgid "Couldn't allocate memory to parse options!\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:533
+#: misc/dumpe2fs.c:537
 #, c-format
 msgid "Invalid superblock parameter: %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:548
+#: misc/dumpe2fs.c:552
 #, c-format
 msgid "Invalid blocksize parameter: %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:559
+#: misc/dumpe2fs.c:563
 #, c-format
 msgid ""
 "\n"
@@ -4271,27 +4276,27 @@ msgid ""
 "\tblocksize=<blocksize>\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:649 misc/mke2fs.c:1889
+#: misc/dumpe2fs.c:653 misc/mke2fs.c:1887
 #, c-format
 msgid "\tUsing %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:694 misc/e2image.c:1629 misc/tune2fs.c:2925
+#: misc/dumpe2fs.c:698 misc/e2image.c:1629 misc/tune2fs.c:2925
 #: resize/main.c:416
 msgid "Couldn't find valid filesystem superblock.\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:716
+#: misc/dumpe2fs.c:720
 #, c-format
 msgid "%s: MMP feature not enabled.\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:747
+#: misc/dumpe2fs.c:751
 #, c-format
 msgid "while trying to read '%s' bitmaps\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:756
+#: misc/dumpe2fs.c:760
 msgid ""
 "*** Run e2fsck now!\n"
 "\n"
@@ -4571,7 +4576,7 @@ msgstr ""
 msgid "e2label: not an ext2 filesystem\n"
 msgstr ""
 
-#: misc/e2label.c:97 misc/tune2fs.c:3129
+#: misc/e2label.c:97 misc/tune2fs.c:3128
 #, c-format
 msgid "Warning: label too long, truncating.\n"
 msgstr ""
@@ -4791,7 +4796,7 @@ msgid ""
 "mount_time           sb_uuid label\n"
 msgstr ""
 
-#: misc/findsuper.c:264
+#: misc/findsuper.c:265
 #, c-format
 msgid ""
 "\n"
@@ -4906,7 +4911,7 @@ msgstr ""
 msgid "%s: %s.\n"
 msgstr ""
 
-#: misc/fuse2fs.c:3777 misc/fuse2fs.c:3792 misc/tune2fs.c:3025
+#: misc/fuse2fs.c:3777 misc/fuse2fs.c:3792 misc/tune2fs.c:3024
 #, c-format
 msgid "Please run e2fsck -fy %s.\n"
 msgstr ""
@@ -5029,7 +5034,7 @@ msgid ""
 "Could not write %d blocks in inode table starting at %llu: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:456 misc/mke2fs.c:2809 misc/mke2fs.c:3214
+#: misc/mke2fs.c:456 misc/mke2fs.c:2807 misc/mke2fs.c:3212
 msgid "done                            \n"
 msgstr ""
 
@@ -5093,176 +5098,176 @@ msgstr ""
 msgid "while writing journal superblock"
 msgstr ""
 
-#: misc/mke2fs.c:665
+#: misc/mke2fs.c:664
 #, c-format
 msgid "Creating filesystem with %llu %dk blocks and %u inodes\n"
 msgstr ""
 
-#: misc/mke2fs.c:673
+#: misc/mke2fs.c:672
 #, c-format
 msgid ""
 "warning: %llu blocks unused.\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:678
+#: misc/mke2fs.c:675
 #, c-format
-msgid "Filesystem label=%s\n"
+msgid "Filesystem label=%.*s\n"
 msgstr ""
 
-#: misc/mke2fs.c:681
+#: misc/mke2fs.c:679
 #, c-format
 msgid "OS type: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:683
+#: misc/mke2fs.c:681
 #, c-format
 msgid "Block size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:686
+#: misc/mke2fs.c:684
 #, c-format
 msgid "Cluster size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:690
+#: misc/mke2fs.c:688
 #, c-format
 msgid "Fragment size=%u (log=%u)\n"
 msgstr ""
 
-#: misc/mke2fs.c:692
+#: misc/mke2fs.c:690
 #, c-format
 msgid "Stride=%u blocks, Stripe width=%u blocks\n"
 msgstr ""
 
-#: misc/mke2fs.c:694
+#: misc/mke2fs.c:692
 #, c-format
 msgid "%u inodes, %llu blocks\n"
 msgstr ""
 
-#: misc/mke2fs.c:696
+#: misc/mke2fs.c:694
 #, c-format
 msgid "%llu blocks (%2.2f%%) reserved for the super user\n"
 msgstr ""
 
-#: misc/mke2fs.c:699
+#: misc/mke2fs.c:697
 #, c-format
 msgid "First data block=%u\n"
 msgstr ""
 
-#: misc/mke2fs.c:701
+#: misc/mke2fs.c:699
 #, c-format
 msgid "Root directory owner=%u:%u\n"
 msgstr ""
 
-#: misc/mke2fs.c:703
+#: misc/mke2fs.c:701
 #, c-format
 msgid "Maximum filesystem blocks=%lu\n"
 msgstr ""
 
-#: misc/mke2fs.c:707
+#: misc/mke2fs.c:705
 #, c-format
 msgid "%u block groups\n"
 msgstr ""
 
-#: misc/mke2fs.c:709
+#: misc/mke2fs.c:707
 #, c-format
 msgid "%u block group\n"
 msgstr ""
 
-#: misc/mke2fs.c:711
+#: misc/mke2fs.c:709
 #, c-format
 msgid "%u blocks per group, %u clusters per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:714
+#: misc/mke2fs.c:712
 #, c-format
 msgid "%u blocks per group, %u fragments per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:716
+#: misc/mke2fs.c:714
 #, c-format
 msgid "%u inodes per group\n"
 msgstr ""
 
-#: misc/mke2fs.c:725
+#: misc/mke2fs.c:723
 #, c-format
 msgid "Filesystem UUID: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:726
+#: misc/mke2fs.c:724
 msgid "Superblock backups stored on blocks: "
 msgstr ""
 
-#: misc/mke2fs.c:822
+#: misc/mke2fs.c:820
 #, c-format
 msgid "%s requires '-O 64bit'\n"
 msgstr ""
 
-#: misc/mke2fs.c:828
+#: misc/mke2fs.c:826
 #, c-format
 msgid "'%s' must be before 'resize=%u'\n"
 msgstr ""
 
-#: misc/mke2fs.c:841
+#: misc/mke2fs.c:839
 #, c-format
 msgid "Invalid desc_size: '%s'\n"
 msgstr ""
 
-#: misc/mke2fs.c:855
+#: misc/mke2fs.c:853
 #, c-format
 msgid "Invalid hash seed: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:867
+#: misc/mke2fs.c:865
 #, c-format
 msgid "Invalid offset: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:881 misc/tune2fs.c:2067
+#: misc/mke2fs.c:879 misc/tune2fs.c:2067
 #, c-format
 msgid "Invalid mmp_update_interval: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:898
+#: misc/mke2fs.c:896
 #, c-format
 msgid "Invalid # of backup superblocks: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:920
+#: misc/mke2fs.c:918
 #, c-format
 msgid "Invalid stride parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:935
+#: misc/mke2fs.c:933
 #, c-format
 msgid "Invalid stripe-width parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:958
+#: misc/mke2fs.c:956
 #, c-format
 msgid "Invalid resize parameter: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:965
+#: misc/mke2fs.c:963
 msgid "The resize maximum must be greater than the filesystem size.\n"
 msgstr ""
 
-#: misc/mke2fs.c:989
+#: misc/mke2fs.c:987
 msgid "On-line resizing not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1015 misc/mke2fs.c:1024
+#: misc/mke2fs.c:1013 misc/mke2fs.c:1022
 #, c-format
 msgid "Invalid root_owner: '%s'\n"
 msgstr ""
 
-#: misc/mke2fs.c:1069
+#: misc/mke2fs.c:1067
 #, c-format
 msgid "Invalid encoding: %s"
 msgstr ""
 
-#: misc/mke2fs.c:1087
+#: misc/mke2fs.c:1085
 #, c-format
 msgid ""
 "\n"
@@ -5291,7 +5296,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1114
+#: misc/mke2fs.c:1112
 #, c-format
 msgid ""
 "\n"
@@ -5299,52 +5304,52 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1125
+#: misc/mke2fs.c:1123
 #, c-format
 msgid "error: Invalid encoding flag: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1131
+#: misc/mke2fs.c:1129
 #, c-format
 msgid ""
 "error: An encoding must be explicitly specified when passing encoding-flags\n"
 msgstr ""
 
-#: misc/mke2fs.c:1179
+#: misc/mke2fs.c:1177
 #, c-format
 msgid ""
 "Syntax error in mke2fs config file (%s, line #%d)\n"
 "\t%s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1192 misc/tune2fs.c:1068
+#: misc/mke2fs.c:1190 misc/tune2fs.c:1068
 #, c-format
 msgid "Invalid filesystem option set: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1204 misc/tune2fs.c:417
+#: misc/mke2fs.c:1202 misc/tune2fs.c:417
 #, c-format
 msgid "Invalid mount option set: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1340
+#: misc/mke2fs.c:1338
 #, c-format
 msgid ""
 "\n"
 "Your mke2fs.conf file does not define the %s filesystem type.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1344
+#: misc/mke2fs.c:1342
 msgid ""
 "You probably need to install an updated mke2fs.conf file.\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1348
+#: misc/mke2fs.c:1346
 msgid "Aborting...\n"
 msgstr ""
 
-#: misc/mke2fs.c:1389
+#: misc/mke2fs.c:1387
 #, c-format
 msgid ""
 "\n"
@@ -5352,154 +5357,154 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1571
+#: misc/mke2fs.c:1569
 msgid "Couldn't allocate memory for new PATH.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1608
+#: misc/mke2fs.c:1606
 #, c-format
 msgid "Couldn't init profile successfully (error: %ld).\n"
 msgstr ""
 
-#: misc/mke2fs.c:1641
+#: misc/mke2fs.c:1639
 #, c-format
 msgid "invalid block size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1645
+#: misc/mke2fs.c:1643
 #, c-format
 msgid "Warning: blocksize %d not usable on most systems.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1661
+#: misc/mke2fs.c:1659
 #, c-format
 msgid "invalid cluster size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1674
+#: misc/mke2fs.c:1672
 msgid "'-R' is deprecated, use '-E' instead"
 msgstr ""
 
-#: misc/mke2fs.c:1688 misc/tune2fs.c:1796
+#: misc/mke2fs.c:1686 misc/tune2fs.c:1796
 #, c-format
 msgid "bad error behavior - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1700
+#: misc/mke2fs.c:1698
 msgid "Illegal number for blocks per group"
 msgstr ""
 
-#: misc/mke2fs.c:1705
+#: misc/mke2fs.c:1703
 msgid "blocks per group must be multiple of 8"
 msgstr ""
 
-#: misc/mke2fs.c:1713
+#: misc/mke2fs.c:1711
 msgid "Illegal number for flex_bg size"
 msgstr ""
 
-#: misc/mke2fs.c:1719
+#: misc/mke2fs.c:1717
 msgid "flex_bg size must be a power of 2"
 msgstr ""
 
-#: misc/mke2fs.c:1724
+#: misc/mke2fs.c:1722
 #, c-format
 msgid "flex_bg size (%lu) must be less than or equal to 2^31"
 msgstr ""
 
-#: misc/mke2fs.c:1734
+#: misc/mke2fs.c:1732
 #, c-format
 msgid "invalid inode ratio %s (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1744
+#: misc/mke2fs.c:1742
 #, c-format
 msgid "invalid inode size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1757
+#: misc/mke2fs.c:1755
 msgid ""
 "Warning: -K option is deprecated and should not be used anymore. Use '-E "
 "nodiscard' extended option instead!\n"
 msgstr ""
 
-#: misc/mke2fs.c:1768
+#: misc/mke2fs.c:1766
 msgid "in malloc for bad_blocks_filename"
 msgstr ""
 
-#: misc/mke2fs.c:1777
+#: misc/mke2fs.c:1775
 #, c-format
 msgid ""
 "Warning: label too long; will be truncated to '%s'\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1786
+#: misc/mke2fs.c:1784
 #, c-format
 msgid "invalid reserved blocks percent - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1801
+#: misc/mke2fs.c:1799
 #, c-format
 msgid "bad num inodes - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1814
+#: misc/mke2fs.c:1812
 msgid "while allocating fs_feature string"
 msgstr ""
 
-#: misc/mke2fs.c:1831
+#: misc/mke2fs.c:1829
 #, c-format
 msgid "bad revision level - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1836
+#: misc/mke2fs.c:1834
 #, c-format
 msgid "while trying to create revision %d"
 msgstr ""
 
-#: misc/mke2fs.c:1850
+#: misc/mke2fs.c:1848
 msgid "The -t option may only be used once"
 msgstr ""
 
-#: misc/mke2fs.c:1858
+#: misc/mke2fs.c:1856
 msgid "The -T option may only be used once"
 msgstr ""
 
-#: misc/mke2fs.c:1914 misc/mke2fs.c:3298
+#: misc/mke2fs.c:1912 misc/mke2fs.c:3296
 #, c-format
 msgid "while trying to open journal device %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1920
+#: misc/mke2fs.c:1918
 #, c-format
 msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1926
+#: misc/mke2fs.c:1924
 #, c-format
 msgid "Using journal device's blocksize: %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1937
+#: misc/mke2fs.c:1935
 #, c-format
 msgid "invalid blocks '%s' on device '%s'"
 msgstr ""
 
-#: misc/mke2fs.c:1967
+#: misc/mke2fs.c:1965
 msgid "filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1985 resize/main.c:497
+#: misc/mke2fs.c:1983 resize/main.c:497
 msgid "while trying to determine filesystem size"
 msgstr ""
 
-#: misc/mke2fs.c:1991
+#: misc/mke2fs.c:1989
 msgid ""
 "Couldn't determine device size; you must specify\n"
 "the size of the filesystem\n"
 msgstr ""
 
-#: misc/mke2fs.c:1998
+#: misc/mke2fs.c:1996
 msgid ""
 "Device size reported to be zero.  Invalid partition specified, or\n"
 "\tpartition table wasn't reread after running fdisk, due to\n"
@@ -5507,142 +5512,142 @@ msgid ""
 "\tto re-read your partition table.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2015
+#: misc/mke2fs.c:2013
 msgid "Filesystem larger than apparent device size."
 msgstr ""
 
-#: misc/mke2fs.c:2035
+#: misc/mke2fs.c:2033
 msgid "Failed to parse fs types list\n"
 msgstr ""
 
-#: misc/mke2fs.c:2085
+#: misc/mke2fs.c:2083
 msgid "The HURD does not support the filetype feature.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2090
+#: misc/mke2fs.c:2088
 msgid "The HURD does not support the huge_file feature.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2095
+#: misc/mke2fs.c:2093
 msgid "The HURD does not support the metadata_csum feature.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2100
+#: misc/mke2fs.c:2098
 msgid "The HURD does not support the ea_inode feature.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2110
+#: misc/mke2fs.c:2108
 msgid "while trying to determine hardware sector size"
 msgstr ""
 
-#: misc/mke2fs.c:2116
+#: misc/mke2fs.c:2114
 msgid "while trying to determine physical sector size"
 msgstr ""
 
-#: misc/mke2fs.c:2148
+#: misc/mke2fs.c:2146
 msgid "while setting blocksize; too small for device\n"
 msgstr ""
 
-#: misc/mke2fs.c:2153
+#: misc/mke2fs.c:2151
 #, c-format
 msgid ""
 "Warning: specified blocksize %d is less than device physical sectorsize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:2177
+#: misc/mke2fs.c:2175
 #, 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:2191
+#: misc/mke2fs.c:2189
 #, c-format
 msgid ""
 "%s: Size of device (0x%llx blocks) %s too big to create\n"
 "\ta filesystem using a blocksize of %d.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2213
+#: misc/mke2fs.c:2211
 msgid "fs_types for mke2fs.conf resolution: "
 msgstr ""
 
-#: misc/mke2fs.c:2220
+#: misc/mke2fs.c:2218
 msgid "Filesystem features not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:2228
+#: misc/mke2fs.c:2226
 msgid "Sparse superblocks not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:2238
+#: misc/mke2fs.c:2236
 msgid "Journals not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:2251
+#: misc/mke2fs.c:2249
 #, c-format
 msgid "invalid reserved blocks percent - %lf"
 msgstr ""
 
-#: misc/mke2fs.c:2268
+#: misc/mke2fs.c:2266
 msgid ""
 "Extents MUST be enabled for a 64-bit filesystem.  Pass -O extents to "
 "rectify.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2288
+#: misc/mke2fs.c:2286
 msgid "The cluster size may not be smaller than the block size.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2294
+#: misc/mke2fs.c:2292
 msgid "specifying a cluster size requires the bigalloc feature"
 msgstr ""
 
-#: misc/mke2fs.c:2314
+#: misc/mke2fs.c:2312
 #, c-format
 msgid "warning: Unable to get device geometry for %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:2317
+#: misc/mke2fs.c:2315
 #, c-format
 msgid "%s alignment is offset by %lu bytes.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2319
+#: misc/mke2fs.c:2317
 #, c-format
 msgid ""
 "This may result in very poor performance, (re)-partitioning suggested.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2340
+#: misc/mke2fs.c:2338
 #, c-format
 msgid "%d-byte blocks too big for system (max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:2344
+#: misc/mke2fs.c:2342
 #, c-format
 msgid ""
 "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
 msgstr ""
 
-#: misc/mke2fs.c:2352
+#: misc/mke2fs.c:2350
 #, c-format
 msgid ""
 "Suggestion: Use Linux kernel >= 3.18 for improved stability of the metadata "
 "and journal checksum features.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2398
+#: misc/mke2fs.c:2396
 #, c-format
 msgid "Unknown filename encoding from profile: %s"
 msgstr ""
 
-#: misc/mke2fs.c:2409
+#: misc/mke2fs.c:2407
 #, c-format
 msgid "Unknown encoding flags from profile: %s"
 msgstr ""
 
-#: misc/mke2fs.c:2434
+#: misc/mke2fs.c:2432
 #, c-format
 msgid ""
 "\n"
@@ -5652,28 +5657,28 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:2449
+#: misc/mke2fs.c:2447
 #, c-format
 msgid "%d byte inodes are too small for project quota"
 msgstr ""
 
-#: misc/mke2fs.c:2465
+#: misc/mke2fs.c:2463
 msgid ""
 "The encrypt and casefold features are not compatible.\n"
 "They can not be both enabled simultaneously.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2480
+#: misc/mke2fs.c:2478
 msgid "Can't support bigalloc feature without extents feature"
 msgstr ""
 
-#: misc/mke2fs.c:2487
+#: misc/mke2fs.c:2485
 msgid ""
 "The resize_inode and meta_bg features are not compatible.\n"
 "They can not be both enabled simultaneously.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2495
+#: misc/mke2fs.c:2493
 msgid ""
 "\n"
 "Warning: the bigalloc feature is still under development\n"
@@ -5681,39 +5686,39 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:2507
+#: misc/mke2fs.c:2505
 msgid "reserved online resize blocks not supported on non-sparse filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:2516
+#: misc/mke2fs.c:2514
 msgid "blocks per group count out of range"
 msgstr ""
 
-#: misc/mke2fs.c:2538
+#: misc/mke2fs.c:2536
 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
 msgstr ""
 
-#: misc/mke2fs.c:2550
+#: misc/mke2fs.c:2548
 #, c-format
 msgid "invalid inode size %d (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:2565
+#: misc/mke2fs.c:2563
 #, c-format
 msgid "%d byte inodes are too small for inline data; specify larger size"
 msgstr ""
 
-#: misc/mke2fs.c:2580
+#: misc/mke2fs.c:2578
 #, c-format
 msgid "too many inodes (%llu), raise inode ratio?"
 msgstr ""
 
-#: misc/mke2fs.c:2587
+#: misc/mke2fs.c:2585
 #, c-format
 msgid "too many inodes (%llu), specify < 2^32 inodes"
 msgstr ""
 
-#: misc/mke2fs.c:2601
+#: misc/mke2fs.c:2599
 #, c-format
 msgid ""
 "inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -5721,153 +5726,153 @@ msgid ""
 "\tor lower inode count (-N).\n"
 msgstr ""
 
-#: misc/mke2fs.c:2788
+#: misc/mke2fs.c:2786
 msgid "Discarding device blocks: "
 msgstr ""
 
-#: misc/mke2fs.c:2804
+#: misc/mke2fs.c:2802
 msgid "failed - "
 msgstr ""
 
-#: misc/mke2fs.c:2863
+#: misc/mke2fs.c:2861
 msgid "while initializing quota context"
 msgstr ""
 
-#: misc/mke2fs.c:2870
+#: misc/mke2fs.c:2868
 msgid "while writing quota inodes"
 msgstr ""
 
-#: misc/mke2fs.c:2895
+#: misc/mke2fs.c:2893
 #, c-format
 msgid "bad error behavior in profile - %s"
 msgstr ""
 
-#: misc/mke2fs.c:2971
+#: misc/mke2fs.c:2969
 msgid "in malloc for android_sparse_params"
 msgstr ""
 
-#: misc/mke2fs.c:2985
+#: misc/mke2fs.c:2983
 msgid "while setting up superblock"
 msgstr ""
 
-#: misc/mke2fs.c:3001
+#: misc/mke2fs.c:2999
 msgid ""
 "Extents are not enabled.  The file extent tree can be checksummed, whereas "
 "block maps cannot.  Not enabling extents reduces the coverage of metadata "
 "checksumming.  Pass -O extents to rectify.\n"
 msgstr ""
 
-#: misc/mke2fs.c:3008
+#: misc/mke2fs.c:3006
 msgid ""
 "64-bit filesystem support is not enabled.  The larger fields afforded by "
 "this feature enable full-strength checksumming.  Pass -O 64bit to rectify.\n"
 msgstr ""
 
-#: misc/mke2fs.c:3016
+#: misc/mke2fs.c:3014
 msgid "The metadata_csum_seed feature requires the metadata_csum feature.\n"
 msgstr ""
 
-#: misc/mke2fs.c:3040
+#: misc/mke2fs.c:3038
 msgid "Discard succeeded and will return 0s - skipping inode table wipe\n"
 msgstr ""
 
-#: misc/mke2fs.c:3139
+#: misc/mke2fs.c:3137
 #, c-format
 msgid "unknown os - %s"
 msgstr ""
 
-#: misc/mke2fs.c:3202
+#: misc/mke2fs.c:3200
 msgid "Allocating group tables: "
 msgstr ""
 
-#: misc/mke2fs.c:3210
+#: misc/mke2fs.c:3208
 msgid "while trying to allocate filesystem tables"
 msgstr ""
 
-#: misc/mke2fs.c:3219
+#: misc/mke2fs.c:3217
 msgid ""
 "\n"
 "\twhile converting subcluster bitmap"
 msgstr ""
 
-#: misc/mke2fs.c:3225
+#: misc/mke2fs.c:3223
 #, c-format
 msgid "%s may be further corrupted by superblock rewrite\n"
 msgstr ""
 
-#: misc/mke2fs.c:3266
+#: misc/mke2fs.c:3264
 #, c-format
 msgid "while zeroing block %llu at end of filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:3279
+#: misc/mke2fs.c:3277
 msgid "while reserving blocks for online resize"
 msgstr ""
 
-#: misc/mke2fs.c:3291 misc/tune2fs.c:1504
+#: misc/mke2fs.c:3289 misc/tune2fs.c:1504
 msgid "journal"
 msgstr ""
 
-#: misc/mke2fs.c:3303
+#: misc/mke2fs.c:3301
 #, c-format
 msgid "Adding journal to device %s: "
 msgstr ""
 
-#: misc/mke2fs.c:3310
+#: misc/mke2fs.c:3308
 #, c-format
 msgid ""
 "\n"
 "\twhile trying to add journal to device %s"
 msgstr ""
 
-#: misc/mke2fs.c:3315 misc/mke2fs.c:3344 misc/mke2fs.c:3382
+#: misc/mke2fs.c:3313 misc/mke2fs.c:3342 misc/mke2fs.c:3380
 #: misc/mk_hugefiles.c:600 misc/tune2fs.c:1533 misc/tune2fs.c:1552
 msgid "done\n"
 msgstr ""
 
-#: misc/mke2fs.c:3321
+#: misc/mke2fs.c:3319
 msgid "Skipping journal creation in super-only mode\n"
 msgstr ""
 
-#: misc/mke2fs.c:3331
+#: misc/mke2fs.c:3329
 #, c-format
 msgid "Creating journal (%u blocks): "
 msgstr ""
 
-#: misc/mke2fs.c:3340
+#: misc/mke2fs.c:3338
 msgid ""
 "\n"
 "\twhile trying to create journal"
 msgstr ""
 
-#: misc/mke2fs.c:3352 misc/tune2fs.c:1133
+#: misc/mke2fs.c:3350 misc/tune2fs.c:1133
 msgid ""
 "\n"
 "Error while enabling multiple mount protection feature."
 msgstr ""
 
-#: misc/mke2fs.c:3357
+#: misc/mke2fs.c:3355
 #, c-format
 msgid "Multiple mount protection is enabled with update interval %d seconds.\n"
 msgstr ""
 
-#: misc/mke2fs.c:3373
+#: misc/mke2fs.c:3371
 msgid "Copying files into the device: "
 msgstr ""
 
-#: misc/mke2fs.c:3379
+#: misc/mke2fs.c:3377
 msgid "while populating file system"
 msgstr ""
 
-#: misc/mke2fs.c:3386
+#: misc/mke2fs.c:3384
 msgid "Writing superblocks and filesystem accounting information: "
 msgstr ""
 
-#: misc/mke2fs.c:3393
+#: misc/mke2fs.c:3391
 msgid "while writing out and closing file system"
 msgstr ""
 
-#: misc/mke2fs.c:3396
+#: misc/mke2fs.c:3394
 msgid ""
 "done\n"
 "\n"
@@ -6443,7 +6448,7 @@ msgstr ""
 msgid "Resizing inodes could take some time."
 msgstr ""
 
-#: misc/tune2fs.c:3010
+#: misc/tune2fs.c:3009
 #, c-format
 msgid ""
 "Warning: The journal is dirty. You may wish to replay the journal like:\n"
@@ -6454,153 +6459,153 @@ msgid ""
 "by journal recovery.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3021
+#: misc/tune2fs.c:3020
 #, c-format
 msgid "Recovering journal.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3040
+#: misc/tune2fs.c:3039
 #, c-format
 msgid "Setting maximal mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:3046
+#: misc/tune2fs.c:3045
 #, c-format
 msgid "Setting current mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:3051
+#: misc/tune2fs.c:3050
 #, c-format
 msgid "Setting error behavior to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:3056
+#: misc/tune2fs.c:3055
 #, c-format
 msgid "Setting reserved blocks gid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:3061
+#: misc/tune2fs.c:3060
 #, c-format
 msgid "interval between checks is too big (%lu)"
 msgstr ""
 
-#: misc/tune2fs.c:3068
+#: misc/tune2fs.c:3067
 #, c-format
 msgid "Setting interval between checks to %lu seconds\n"
 msgstr ""
 
-#: misc/tune2fs.c:3075
+#: misc/tune2fs.c:3074
 #, c-format
 msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n"
 msgstr ""
 
-#: misc/tune2fs.c:3081
+#: misc/tune2fs.c:3080
 #, c-format
 msgid "reserved blocks count is too big (%llu)"
 msgstr ""
 
-#: misc/tune2fs.c:3088
+#: misc/tune2fs.c:3087
 #, c-format
 msgid "Setting reserved blocks count to %llu\n"
 msgstr ""
 
-#: misc/tune2fs.c:3093
+#: misc/tune2fs.c:3092
 msgid ""
 "\n"
 "The filesystem already has sparse superblocks.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3096
+#: misc/tune2fs.c:3095
 msgid ""
 "\n"
 "Setting the sparse superblock flag not supported\n"
 "for filesystems with the meta_bg feature enabled.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3106
+#: misc/tune2fs.c:3105
 #, c-format
 msgid ""
 "\n"
 "Sparse superblock flag set.  %s"
 msgstr ""
 
-#: misc/tune2fs.c:3111
+#: misc/tune2fs.c:3110
 msgid ""
 "\n"
 "Clearing the sparse superblock flag not supported.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3119
+#: misc/tune2fs.c:3118
 #, c-format
 msgid "Setting time filesystem last checked to %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:3125
+#: misc/tune2fs.c:3124
 #, c-format
 msgid "Setting reserved blocks uid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:3157
+#: misc/tune2fs.c:3156
 msgid "Error in using clear_mmp. It must be used with -f\n"
 msgstr ""
 
-#: misc/tune2fs.c:3175
+#: misc/tune2fs.c:3174
 msgid ""
 "The quota feature may only be changed when the filesystem is unmounted.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3193
+#: misc/tune2fs.c:3192
 msgid "Setting the UUID on this filesystem could take some time."
 msgstr ""
 
-#: misc/tune2fs.c:3208
+#: misc/tune2fs.c:3207
 msgid "The UUID may only be changed when the filesystem is unmounted.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3211
+#: misc/tune2fs.c:3210
 msgid ""
 "If you only use kernels newer than v4.4, run 'tune2fs -O metadata_csum_seed' "
 "and re-run this command.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3241
+#: misc/tune2fs.c:3240
 msgid "Invalid UUID format\n"
 msgstr ""
 
-#: misc/tune2fs.c:3257
+#: misc/tune2fs.c:3256
 msgid "Need to update journal superblock.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3279
+#: misc/tune2fs.c:3278
 msgid "The inode size may only be changed when the filesystem is unmounted.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3286
+#: misc/tune2fs.c:3285
 msgid ""
 "Changing the inode size not supported for filesystems with the flex_bg\n"
 "feature enabled.\n"
 msgstr ""
 
-#: misc/tune2fs.c:3304
+#: misc/tune2fs.c:3303
 #, c-format
 msgid "Setting inode size %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:3308
+#: misc/tune2fs.c:3307
 msgid "Failed to change inode size\n"
 msgstr ""
 
-#: misc/tune2fs.c:3322
+#: misc/tune2fs.c:3321
 #, c-format
 msgid "Setting stride size to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:3327
+#: misc/tune2fs.c:3326
 #, c-format
 msgid "Setting stripe width to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:3334
+#: misc/tune2fs.c:3333
 #, c-format
 msgid "Setting extended default mount options to '%s'\n"
 msgstr ""
@@ -7099,7 +7104,7 @@ msgid "Should never happen: resize inode corrupt!\n"
 msgstr ""
 
 #: lib/ext2fs/ext2_err.c:11
-msgid "EXT2FS Library version 1.45.5"
+msgid "EXT2FS Library version 1.45.6"
 msgstr ""
 
 #: lib/ext2fs/ext2_err.c:12
@@ -7814,6 +7819,10 @@ msgstr ""
 msgid "Inode containing extended attribute value is corrupted"
 msgstr ""
 
+#: lib/ext2fs/ext2_err.c:190
+msgid "Group descriptors not loaded"
+msgstr ""
+
 #: lib/support/prof_err.c:11
 msgid "Profile version 0.0"
 msgstr ""
@@ -7938,68 +7947,68 @@ msgstr ""
 msgid "Bad magic value in profile_file_data_t"
 msgstr ""
 
-#: lib/support/plausible.c:118
+#: lib/support/plausible.c:114
 #, c-format
-msgid "\tlast mounted on %s on %s"
+msgid "\tlast mounted on %.*s on %s"
 msgstr ""
 
-#: lib/support/plausible.c:121
+#: lib/support/plausible.c:117
 #, c-format
 msgid "\tlast mounted on %s"
 msgstr ""
 
-#: lib/support/plausible.c:124
+#: lib/support/plausible.c:120
 #, c-format
 msgid "\tcreated on %s"
 msgstr ""
 
-#: lib/support/plausible.c:127
+#: lib/support/plausible.c:123
 #, c-format
 msgid "\tlast modified on %s"
 msgstr ""
 
-#: lib/support/plausible.c:161
+#: lib/support/plausible.c:157
 #, c-format
 msgid "Found a %s partition table in %s\n"
 msgstr ""
 
-#: lib/support/plausible.c:191
+#: lib/support/plausible.c:187
 #, c-format
 msgid "The file %s does not exist and no size was specified.\n"
 msgstr ""
 
-#: lib/support/plausible.c:199
+#: lib/support/plausible.c:195
 #, c-format
 msgid "Creating regular file %s\n"
 msgstr ""
 
-#: lib/support/plausible.c:202
+#: lib/support/plausible.c:198
 #, c-format
 msgid "Could not open %s: %s\n"
 msgstr ""
 
-#: lib/support/plausible.c:205
+#: lib/support/plausible.c:201
 msgid ""
 "\n"
 "The device apparently does not exist; did you specify it correctly?\n"
 msgstr ""
 
-#: lib/support/plausible.c:227
+#: lib/support/plausible.c:223
 #, c-format
 msgid "%s is not a block special device.\n"
 msgstr ""
 
-#: lib/support/plausible.c:249
+#: lib/support/plausible.c:245
 #, c-format
 msgid "%s contains a %s file system labelled '%s'\n"
 msgstr ""
 
-#: lib/support/plausible.c:252
+#: lib/support/plausible.c:248
 #, c-format
 msgid "%s contains a %s file system\n"
 msgstr ""
 
-#: lib/support/plausible.c:276
+#: lib/support/plausible.c:272
 #, c-format
 msgid "%s contains `%s' data\n"
 msgstr ""

diff --git a/version.h b/version.h
index 3efe120957ed93ae9f4592dcbb26a8a12c3e6c08..ad8fce1ed56b5b8bc069a7720d1d97bf7984a1b7 100644 (file)
--- a/version.h
+++ b/version.h
@@ -7,5 +7,5 @@
  * file may be redistributed under the GNU Public License v2.
  */
 
-#define E2FSPROGS_VERSION "1.45.5"
-#define E2FSPROGS_DATE "07-Jan-2020"
+#define E2FSPROGS_VERSION "1.45.6"
+#define E2FSPROGS_DATE "20-Mar-2020"