Update release notes, changelog, and other files for v1.40.11 release

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

diff --git a/README b/README
index 7988b85..cfcf7e3 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-       This is the new version (1.40.10) of the second extended file
+       This is the new version (1.40.11) 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 56b3de6..ae31fb0 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,3 +1,31 @@
+E2fsprogs 1.40.11 (June 17, 2008)
+=================================
+
+Mke2fs, tune2fs, and resize2fs now use floating point to calculate the
+percentage of reserved blocks.  (Addresses Debian Bug: #452639)
+
+Updated Spanish and Catalan translations.
+
+Fixed various Debian packaging issues --- see debian/changelog for
+details.  (Addresses Debian Bugs: #483962, #483023)
+
+Add detection for ZFS volumes to the libblkid library.
+
+Fixed spelling mistakes, typos, and otherwise clarified man pages.
+(Addresses Debian Bug: #486463)
+
+Programmer's notes:
+-------------------
+
+Fix marginal C code in probe_lvm2() function to the blkid library more
+portable for older compilers.
+
+Fix build problems on MacOS X.  (Addresses Sourceforge Bug: #1972473)
+
+Fix ext2fs_swap{16,32,64} functions so they can be used by external
+applications on big-endian machines.  (Addresses Debian Bug: #484879)
+    
+
 E2fsprogs 1.40.10 (May 21, 2008)
 ================================
 

diff --git a/debian/changelog b/debian/changelog
index b91a23b..5f74bf1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+e2fsprogs (1.40.11-1) unstable; urgency=low
+
+  * Change mke2fs, tune2fs and resize2fs to use floating point precision
+    when calculating the number of reserved blocks.  (Closes: #452639)
+  * Update Spanish and Catalan translations.
+  * Fix ext2fs_swap{16,32,64} for external applications.  (Closes: #484879)
+  * Improve uuid-runtime package description.  (Closes: #483962)
+  * Improve e2fsprogs package description.  (Closes: #483023)
+  * Add support for detecting ZFS volumes to libblkid.
+  * Clarify debugfs man page.  (Closes: #486463)
+
+ -- Theodore Y. Ts'o <tytso@mit.edu>  Tue, 17 Jun 2008 21:59:21 -0400
+
 e2fsprogs (1.40.10-1) unstable; urgency=low
 
   * Fix a very rare potential data corruption bug in e2fsck's journal

diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index b887ad6..0ca7ed4 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.40.10)
+@settitle The EXT2FS Library (version 1.40.11)
 @synindex tp fn
 @comment %**end of header
 
@@ -61,8 +61,8 @@ by the author.
 
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
-@subtitle Version 1.40.10
-@subtitle May 2008
+@subtitle Version 1.40.11
+@subtitle June 2008
 
 @author by Theodore Ts'o
 
@@ -103,7 +103,7 @@ by the Foundation.
 
 @top The EXT2FS Library
 
-This manual documents the EXT2FS Library, version 1.40.10.
+This manual documents the EXT2FS Library, version 1.40.11.
 
 @end ifinfo
 

diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index e5ae473..8bcc6d0 100644 (file)
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,16 +1,16 @@
 Begin3
 Title:          EXT2 Filesystem utilities
-Version:        1.40.10
-Entered-date:   21May2008
+Version:        1.40.11
+Entered-date:   17June2008
 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
-               4004kB e2fsprogs-1.40.10.tar.gz
-               468kB e2fsprogs-libs-1.40.10.tar.gz
-                1kB   e2fsprogs-1.40.10.lsm
+               4024kB e2fsprogs-1.40.11.tar.gz
+               468kB e2fsprogs-libs-1.40.11.tar.gz
+                1kB   e2fsprogs-1.40.11.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/LGPL

diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index 1baf6e5..b6962c4 100644 (file)
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -66,7 +66,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
-"POT-Creation-Date: 2008-02-28 21:45-0500\n"
+"POT-Creation-Date: 2008-06-17 22:16-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"
@@ -88,10 +88,10 @@ msgid "while reading the bad blocks inode"
 msgstr ""
 
 #: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1010 e2fsck/unix.c:1093 misc/badblocks.c:1025
+#: e2fsck/unix.c:1016 e2fsck/unix.c:1099 misc/badblocks.c:1025
 #: misc/badblocks.c:1033 misc/badblocks.c:1047 misc/badblocks.c:1059
-#: misc/dumpe2fs.c:483 misc/e2image.c:571 misc/e2image.c:664
-#: misc/e2image.c:680 misc/mke2fs.c:173 misc/tune2fs.c:916 resize/main.c:296
+#: misc/dumpe2fs.c:483 misc/e2image.c:571 misc/e2image.c:667
+#: misc/e2image.c:683 misc/mke2fs.c:173 misc/tune2fs.c:917 resize/main.c:296
 #, c-format
 msgid "while trying to open %s"
 msgstr ""
@@ -185,12 +185,12 @@ msgstr ""
 msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
 msgstr ""
 
-#: e2fsck/iscan.c:83 e2fsck/unix.c:786
+#: e2fsck/iscan.c:83 e2fsck/unix.c:791
 #, c-format
 msgid "while opening %s for flushing"
 msgstr ""
 
-#: e2fsck/iscan.c:88 e2fsck/unix.c:792 resize/main.c:274
+#: e2fsck/iscan.c:88 e2fsck/unix.c:797 resize/main.c:274
 #, c-format
 msgid "while trying to flush %s"
 msgstr ""
@@ -439,7 +439,7 @@ msgstr ""
 
 #: e2fsck/pass1b.c:566 e2fsck/pass1b.c:703
 #, c-format
-msgid "internal error; can't find dup_blk for %u\n"
+msgid "internal error: can't find dup_blk for %u\n"
 msgstr ""
 
 #: e2fsck/pass1b.c:746
@@ -513,15 +513,15 @@ msgstr ""
 msgid "ext attr block map"
 msgstr ""
 
-#: e2fsck/pass1.c:2072
+#: e2fsck/pass1.c:2095
 msgid "block bitmap"
 msgstr ""
 
-#: e2fsck/pass1.c:2076
+#: e2fsck/pass1.c:2099
 msgid "inode bitmap"
 msgstr ""
 
-#: e2fsck/pass1.c:2080
+#: e2fsck/pass1.c:2103
 msgid "inode table"
 msgstr ""
 
@@ -529,6 +529,10 @@ msgstr ""
 msgid "Pass 2"
 msgstr ""
 
+#: e2fsck/pass2.c:793
+msgid "Can not continue."
+msgstr ""
+
 #: e2fsck/pass3.c:79
 msgid "inode done bitmap"
 msgstr ""
@@ -1220,7 +1224,7 @@ msgstr ""
 msgid "Warning: could not write @b %b for %s: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:543 e2fsck/problem.c:1280
+#: e2fsck/problem.c:543 e2fsck/problem.c:1284
 #. @-expanded: error allocating inode bitmap (%N): %m\n
 msgid "@A @i @B (%N): %m\n"
 msgstr ""
@@ -1709,7 +1713,7 @@ msgstr ""
 msgid "@E is duplicate '..' @e.\n"
 msgstr ""
 
-#: e2fsck/problem.c:1024 e2fsck/problem.c:1305
+#: e2fsck/problem.c:1024 e2fsck/problem.c:1309
 #, c-format
 msgid "Internal error: couldn't find dir_info for %i.\n"
 msgstr ""
@@ -1888,90 +1892,95 @@ msgstr ""
 msgid "i_blocks_hi @F %N, @s zero.\n"
 msgstr ""
 
-#: e2fsck/problem.c:1195
+#: e2fsck/problem.c:1193
+#. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n
+msgid "Unexpected @b in @h %d (%q).\n"
+msgstr ""
+
+#: e2fsck/problem.c:1199
 #. @-expanded: Pass 3: Checking directory connectivity\n
 msgid "Pass 3: Checking @d connectivity\n"
 msgstr ""
 
-#: e2fsck/problem.c:1200
+#: e2fsck/problem.c:1204
 #. @-expanded: root inode not allocated.  
 msgid "@r not allocated.  "
 msgstr ""
 
-#: e2fsck/problem.c:1205
+#: e2fsck/problem.c:1209
 #. @-expanded: No room in lost+found directory.  
 msgid "No room in @l @d.  "
 msgstr ""
 
-#: e2fsck/problem.c:1210
+#: e2fsck/problem.c:1214
 #, c-format
 #. @-expanded: Unconnected directory inode %i (%p)\n
 msgid "Unconnected @d @i %i (%p)\n"
 msgstr ""
 
-#: e2fsck/problem.c:1215
+#: e2fsck/problem.c:1219
 #. @-expanded: /lost+found not found.  
 msgid "/@l not found.  "
 msgstr ""
 
-#: e2fsck/problem.c:1220
+#: e2fsck/problem.c:1224
 #. @-expanded: '..' in %Q (%i) is %P (%j), should be %q (%d).\n
 msgid "'..' in %Q (%i) is %P (%j), @s %q (%d).\n"
 msgstr ""
 
-#: e2fsck/problem.c:1225
+#: e2fsck/problem.c:1229
 #. @-expanded: Bad or non-existent /lost+found.  Cannot reconnect.\n
 msgid "Bad or non-existent /@l.  Cannot reconnect.\n"
 msgstr ""
 
-#: e2fsck/problem.c:1230
+#: e2fsck/problem.c:1234
 #, c-format
 #. @-expanded: Could not expand /lost+found: %m\n
 msgid "Could not expand /@l: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:1235
+#: e2fsck/problem.c:1239
 #, c-format
 msgid "Could not reconnect %i: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:1240
+#: e2fsck/problem.c:1244
 #, c-format
 #. @-expanded: Error while trying to find /lost+found: %m\n
 msgid "Error while trying to find /@l: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:1245
+#: e2fsck/problem.c:1249
 #, c-format
 #. @-expanded: ext2fs_new_block: %m while trying to create /lost+found directory\n
 msgid "ext2fs_new_@b: %m while trying to create /@l @d\n"
 msgstr ""
 
-#: e2fsck/problem.c:1250
+#: e2fsck/problem.c:1254
 #, c-format
 #. @-expanded: ext2fs_new_inode: %m while trying to create /lost+found directory\n
 msgid "ext2fs_new_@i: %m while trying to create /@l @d\n"
 msgstr ""
 
-#: e2fsck/problem.c:1255
+#: e2fsck/problem.c:1259
 #, c-format
 #. @-expanded: ext2fs_new_dir_block: %m while creating new directory block\n
 msgid "ext2fs_new_dir_@b: %m while creating new @d @b\n"
 msgstr ""
 
-#: e2fsck/problem.c:1260
+#: e2fsck/problem.c:1264
 #, c-format
 #. @-expanded: ext2fs_write_dir_block: %m while writing the directory block for /lost+found\n
 msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
 msgstr ""
 
-#: e2fsck/problem.c:1265
+#: e2fsck/problem.c:1269
 #, c-format
 #. @-expanded: Error while adjusting inode count on inode %i\n
 msgid "Error while adjusting @i count on @i %i\n"
 msgstr ""
 
-#: e2fsck/problem.c:1270
+#: e2fsck/problem.c:1274
 #, c-format
 #. @-expanded: Couldn't fix parent of inode %i: %m\n
 #. @-expanded: \n
@@ -1980,7 +1989,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/problem.c:1275
+#: e2fsck/problem.c:1279
 #, c-format
 #. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n
 #. @-expanded: \n
@@ -1989,73 +1998,73 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/problem.c:1285
+#: e2fsck/problem.c:1289
 #, c-format
 #. @-expanded: Error creating root directory (%s): %m\n
 msgid "Error creating root @d (%s): %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:1290
+#: e2fsck/problem.c:1294
 #, c-format
 #. @-expanded: Error creating /lost+found directory (%s): %m\n
 msgid "Error creating /@l @d (%s): %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:1295
+#: e2fsck/problem.c:1299
 #. @-expanded: root inode is not a directory; aborting.\n
 msgid "@r is not a @d; aborting.\n"
 msgstr ""
 
-#: e2fsck/problem.c:1300
+#: e2fsck/problem.c:1304
 #. @-expanded: Cannot proceed without a root inode.\n
 msgid "Cannot proceed without a @r.\n"
 msgstr ""
 
-#: e2fsck/problem.c:1310
+#: e2fsck/problem.c:1314
 #, c-format
 #. @-expanded: /lost+found is not a directory (ino=%i)\n
 msgid "/@l is not a @d (ino=%i)\n"
 msgstr ""
 
-#: e2fsck/problem.c:1317
+#: e2fsck/problem.c:1321
 msgid "Pass 3A: Optimizing directories\n"
 msgstr ""
 
-#: e2fsck/problem.c:1322
+#: e2fsck/problem.c:1326
 #, c-format
 msgid "Failed to create dirs_to_hash iterator: %m"
 msgstr ""
 
-#: e2fsck/problem.c:1327
+#: e2fsck/problem.c:1331
 msgid "Failed to optimize directory %q (%d): %m"
 msgstr ""
 
-#: e2fsck/problem.c:1332
+#: e2fsck/problem.c:1336
 msgid "Optimizing directories: "
 msgstr ""
 
-#: e2fsck/problem.c:1349
+#: e2fsck/problem.c:1353
 msgid "Pass 4: Checking reference counts\n"
 msgstr ""
 
-#: e2fsck/problem.c:1354
+#: e2fsck/problem.c:1358
 #, c-format
 #. @-expanded: unattached zero-length inode %i.  
 msgid "@u @z @i %i.  "
 msgstr ""
 
-#: e2fsck/problem.c:1359
+#: e2fsck/problem.c:1363
 #, c-format
 #. @-expanded: unattached inode %i\n
 msgid "@u @i %i\n"
 msgstr ""
 
-#: e2fsck/problem.c:1364
+#: e2fsck/problem.c:1368
 #. @-expanded: inode %i ref count is %Il, should be %N.  
 msgid "@i %i ref count is %Il, @s %N.  "
 msgstr ""
 
-#: e2fsck/problem.c:1368
+#: e2fsck/problem.c:1372
 #. @-expanded: WARNING: PROGRAMMING BUG IN E2FSCK!\n
 #. @-expanded: \tOR SOME BONEHEAD (YOU) IS CHECKING A MOUNTED (LIVE) FILESYSTEM.\n
 #. @-expanded: inode_link_info[%i] is %N, inode.i_links_count is %Il.  They should be the same!\n
@@ -2065,57 +2074,57 @@ msgid ""
 "@i_link_info[%i] is %N, @i.i_links_count is %Il.  They @s the same!\n"
 msgstr ""
 
-#: e2fsck/problem.c:1378
+#: e2fsck/problem.c:1382
 #. @-expanded: Pass 5: Checking group summary information\n
 msgid "Pass 5: Checking @g summary information\n"
 msgstr ""
 
-#: e2fsck/problem.c:1383
+#: e2fsck/problem.c:1387
 #. @-expanded: Padding at end of inode bitmap is not set. 
 msgid "Padding at end of @i @B is not set. "
 msgstr ""
 
-#: e2fsck/problem.c:1388
+#: e2fsck/problem.c:1392
 #. @-expanded: Padding at end of block bitmap is not set. 
 msgid "Padding at end of @b @B is not set. "
 msgstr ""
 
-#: e2fsck/problem.c:1393
+#: e2fsck/problem.c:1397
 #. @-expanded: block bitmap differences: 
 msgid "@b @B differences: "
 msgstr ""
 
-#: e2fsck/problem.c:1413
+#: e2fsck/problem.c:1417
 #. @-expanded: inode bitmap differences: 
 msgid "@i @B differences: "
 msgstr ""
 
-#: e2fsck/problem.c:1433
+#: e2fsck/problem.c:1437
 #. @-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:1438
+#: e2fsck/problem.c:1442
 #. @-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:1443
+#: e2fsck/problem.c:1447
 #. @-expanded: Free inodes count wrong (%i, counted=%j).\n
 msgid "Free @is count wrong (%i, counted=%j).\n"
 msgstr ""
 
-#: e2fsck/problem.c:1448
+#: e2fsck/problem.c:1452
 #. @-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:1453
+#: e2fsck/problem.c:1457
 #. @-expanded: Free blocks count wrong (%b, counted=%c).\n
 msgid "Free @bs count wrong (%b, counted=%c).\n"
 msgstr ""
 
-#: e2fsck/problem.c:1458
+#: e2fsck/problem.c:1462
 #. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap 
 #. @-expanded: endpoints (%i, %j)\n
 msgid ""
@@ -2123,32 +2132,32 @@ msgid ""
 "endpoints (%i, %j)\n"
 msgstr ""
 
-#: e2fsck/problem.c:1464
+#: e2fsck/problem.c:1468
 msgid "Internal error: fudging end of bitmap (%N)\n"
 msgstr ""
 
-#: e2fsck/problem.c:1469
+#: e2fsck/problem.c:1473
 #, c-format
 #. @-expanded: Error copying in replacement inode bitmap: %m\n
 msgid "Error copying in replacement @i @B: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:1474
+#: e2fsck/problem.c:1478
 #, c-format
 #. @-expanded: Error copying in replacement block bitmap: %m\n
 msgid "Error copying in replacement @b @B: %m\n"
 msgstr ""
 
-#: e2fsck/problem.c:1499
+#: e2fsck/problem.c:1503
 msgid "Recreate journal to make the filesystem ext3 again?\n"
 msgstr ""
 
-#: e2fsck/problem.c:1617
+#: e2fsck/problem.c:1621
 #, c-format
 msgid "Unhandled error code (0x%x)!\n"
 msgstr ""
 
-#: e2fsck/problem.c:1711
+#: e2fsck/problem.c:1715
 msgid "IGNORED"
 msgstr ""
 
@@ -2269,7 +2278,7 @@ msgstr ""
 msgid "         # of inodes with ind/dind/tind blocks: %u/%u/%u\n"
 msgstr ""
 
-#: e2fsck/unix.c:176 misc/badblocks.c:789 misc/tune2fs.c:941 misc/util.c:151
+#: e2fsck/unix.c:176 misc/badblocks.c:789 misc/tune2fs.c:942 misc/util.c:151
 #: resize/main.c:237
 #, c-format
 msgid "while determining whether %s is mounted."
@@ -2354,7 +2363,7 @@ msgstr ""
 msgid " (check in %ld mounts)"
 msgstr ""
 
-#: e2fsck/unix.c:475
+#: e2fsck/unix.c:476
 #, c-format
 msgid "ERROR: Couldn't open /dev/null (%s)\n"
 msgstr ""
@@ -2376,52 +2385,52 @@ msgid ""
 "\t%s\n"
 msgstr ""
 
-#: e2fsck/unix.c:636
+#: e2fsck/unix.c:640
 #, c-format
 msgid "Error validating file descriptor %d: %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:640
+#: e2fsck/unix.c:644
 msgid "Invalid completion information file descriptor"
 msgstr ""
 
-#: e2fsck/unix.c:655
+#: e2fsck/unix.c:659
 msgid "Only one of the options -p/-a, -n or -y may be specified."
 msgstr ""
 
-#: e2fsck/unix.c:676
+#: e2fsck/unix.c:680
 #, c-format
 msgid "The -t option is not supported on this version of e2fsck.\n"
 msgstr ""
 
-#: e2fsck/unix.c:747
+#: e2fsck/unix.c:751
 #, c-format
 msgid "Byte-swapping filesystems not compiled in this version of e2fsck\n"
 msgstr ""
 
-#: e2fsck/unix.c:770 misc/tune2fs.c:504 misc/tune2fs.c:769 misc/tune2fs.c:786
+#: e2fsck/unix.c:774 misc/tune2fs.c:504 misc/tune2fs.c:770 misc/tune2fs.c:787
 #, c-format
 msgid "Unable to resolve '%s'"
 msgstr ""
 
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:806
 #, c-format
 msgid "Incompatible options not allowed when byte-swapping.\n"
 msgstr ""
 
-#: e2fsck/unix.c:808
+#: e2fsck/unix.c:813
 #, c-format
 msgid "The -c and the -l/-L options may not be both used at the same time.\n"
 msgstr ""
 
-#: e2fsck/unix.c:856
+#: e2fsck/unix.c:861
 #, c-format
 msgid ""
 "E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:865
+#: e2fsck/unix.c:870
 #, c-format
 msgid ""
 "\n"
@@ -2429,38 +2438,38 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:905
+#: e2fsck/unix.c:911
 #, c-format
 msgid "Error: ext2fs library version out of date!\n"
 msgstr ""
 
-#: e2fsck/unix.c:913
+#: e2fsck/unix.c:919
 msgid "while trying to initialize program"
 msgstr ""
 
-#: e2fsck/unix.c:927
+#: e2fsck/unix.c:933
 #, c-format
 msgid "\tUsing %s, %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:939
+#: e2fsck/unix.c:945
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: e2fsck/unix.c:983
+#: e2fsck/unix.c:989
 #, c-format
 msgid "%s: %s trying backup blocks...\n"
 msgstr ""
 
-#: e2fsck/unix.c:985
+#: e2fsck/unix.c:991
 msgid "Superblock invalid,"
 msgstr ""
 
-#: e2fsck/unix.c:986
+#: e2fsck/unix.c:992
 msgid "Group descriptors look bad..."
 msgstr ""
 
-#: e2fsck/unix.c:1013
+#: e2fsck/unix.c:1019
 #, c-format
 msgid ""
 "The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2468,147 +2477,147 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1019
+#: e2fsck/unix.c:1025
 #, c-format
 msgid "Could this be a zero-length partition?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1021
+#: e2fsck/unix.c:1027
 #, c-format
 msgid "You must have %s access to the filesystem or be root\n"
 msgstr ""
 
-#: e2fsck/unix.c:1026
+#: e2fsck/unix.c:1032
 #, c-format
 msgid "Possibly non-existent or swap device?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1028
+#: e2fsck/unix.c:1034
 #, c-format
 msgid "Filesystem mounted or opened exclusively by another program?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1032
+#: e2fsck/unix.c:1038
 #, 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:1096
+#: e2fsck/unix.c:1102
 msgid "Get a newer version of e2fsck!"
 msgstr ""
 
-#: e2fsck/unix.c:1117
+#: e2fsck/unix.c:1126
 #, c-format
 msgid "while checking ext3 journal for %s"
 msgstr ""
 
-#: e2fsck/unix.c:1128
+#: e2fsck/unix.c:1137
 #, c-format
 msgid ""
 "Warning: skipping journal recovery because doing a read-only filesystem "
 "check.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1141
+#: e2fsck/unix.c:1150
 #, c-format
 msgid "unable to set superblock flags on %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1147
+#: e2fsck/unix.c:1156
 #, c-format
 msgid "while recovering ext3 journal of %s"
 msgstr ""
 
-#: e2fsck/unix.c:1171
+#: e2fsck/unix.c:1180
 #, c-format
 msgid "%s has unsupported feature(s):"
 msgstr ""
 
-#: e2fsck/unix.c:1187
+#: e2fsck/unix.c:1196
 msgid "Warning: compression support is experimental.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1192
+#: e2fsck/unix.c:1201
 #, c-format
 msgid ""
 "E2fsck not compiled with HTREE support,\n"
 "\tbut filesystem %s has HTREE directories.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1241
+#: e2fsck/unix.c:1250
 #, c-format
 msgid "%s: Filesystem byte order already normalized.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1261
+#: e2fsck/unix.c:1270
 msgid "while reading bad blocks inode"
 msgstr ""
 
-#: e2fsck/unix.c:1263
+#: e2fsck/unix.c:1272
 #, c-format
 msgid "This doesn't bode well, but we'll try to go on...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1289
+#: e2fsck/unix.c:1298
 msgid "Couldn't determine journal size"
 msgstr ""
 
-#: e2fsck/unix.c:1292 misc/mke2fs.c:1776
+#: e2fsck/unix.c:1301 misc/mke2fs.c:1785
 #, c-format
 msgid "Creating journal (%d blocks): "
 msgstr ""
 
-#: e2fsck/unix.c:1299 misc/mke2fs.c:1784
+#: e2fsck/unix.c:1308 misc/mke2fs.c:1793
 msgid ""
 "\n"
 "\twhile trying to create journal"
 msgstr ""
 
-#: e2fsck/unix.c:1302
+#: e2fsck/unix.c:1311
 #, c-format
 msgid " Done.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1303
+#: e2fsck/unix.c:1312
 #, c-format
 msgid ""
 "\n"
 "*** journal has been re-created - filesystem is now ext3 again ***\n"
 msgstr ""
 
-#: e2fsck/unix.c:1310
+#: e2fsck/unix.c:1319
 #, c-format
 msgid "Restarting e2fsck from the beginning...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1314
+#: e2fsck/unix.c:1323
 msgid "while resetting context"
 msgstr ""
 
-#: e2fsck/unix.c:1321
+#: e2fsck/unix.c:1330
 #, c-format
 msgid "%s: e2fsck canceled.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1326
+#: e2fsck/unix.c:1335
 msgid "aborted"
 msgstr ""
 
-#: e2fsck/unix.c:1338
+#: e2fsck/unix.c:1347
 #, c-format
 msgid ""
 "\n"
 "%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1341
+#: e2fsck/unix.c:1350
 #, c-format
 msgid "%s: ***** REBOOT LINUX *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1349
+#: e2fsck/unix.c:1358
 #, c-format
 msgid ""
 "\n"
@@ -3082,7 +3091,7 @@ msgstr ""
 msgid "Journal users:            %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:337 misc/mke2fs.c:768 misc/tune2fs.c:810
+#: misc/dumpe2fs.c:337 misc/mke2fs.c:768 misc/tune2fs.c:811
 #, c-format
 msgid "Couldn't allocate memory to parse options!\n"
 msgstr ""
@@ -3116,7 +3125,7 @@ msgstr ""
 msgid "\tUsing %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:485 misc/e2image.c:666 misc/tune2fs.c:919 resize/main.c:298
+#: misc/dumpe2fs.c:485 misc/e2image.c:669 misc/tune2fs.c:920 resize/main.c:298
 #, c-format
 msgid "Couldn't find valid filesystem superblock.\n"
 msgstr ""
@@ -3183,7 +3192,7 @@ msgstr ""
 msgid "e2label: not an ext2 filesystem\n"
 msgstr ""
 
-#: misc/e2label.c:96 misc/tune2fs.c:1025
+#: misc/e2label.c:96 misc/tune2fs.c:1026
 #, c-format
 msgid "Warning: label too long, truncating.\n"
 msgstr ""
@@ -3203,17 +3212,17 @@ msgstr ""
 msgid "Usage: e2label device [newlabel]\n"
 msgstr ""
 
-#: misc/fsck.c:343
+#: misc/fsck.c:345
 #, c-format
 msgid "WARNING: couldn't open %s: %s\n"
 msgstr ""
 
-#: misc/fsck.c:353
+#: misc/fsck.c:355
 #, c-format
 msgid "WARNING: bad format on line %d of %s\n"
 msgstr ""
 
-#: misc/fsck.c:368
+#: misc/fsck.c:370
 msgid ""
 "\a\a\aWARNING: Your /etc/fstab does not contain the fsck passno\n"
 "\tfield.  I will kludge around things for you, but you\n"
@@ -3221,78 +3230,78 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/fsck.c:469
+#: misc/fsck.c:479
 #, c-format
 msgid "fsck: %s: not found\n"
 msgstr ""
 
-#: misc/fsck.c:585
+#: misc/fsck.c:595
 #, c-format
 msgid "%s: wait: No more child process?!?\n"
 msgstr ""
 
-#: misc/fsck.c:607
+#: misc/fsck.c:617
 #, c-format
 msgid "Warning... %s for device %s exited with signal %d.\n"
 msgstr ""
 
-#: misc/fsck.c:613
+#: misc/fsck.c:623
 #, c-format
 msgid "%s %s: status is %x, should never happen.\n"
 msgstr ""
 
-#: misc/fsck.c:649
+#: misc/fsck.c:662
 #, c-format
 msgid "Finished with %s (exit status %d)\n"
 msgstr ""
 
-#: misc/fsck.c:709
+#: misc/fsck.c:722
 #, c-format
 msgid "%s: Error %d while executing fsck.%s for %s\n"
 msgstr ""
 
-#: misc/fsck.c:730
+#: misc/fsck.c:743
 msgid ""
 "Either all or none of the filesystem types passed to -t must be prefixed\n"
 "with 'no' or '!'.\n"
 msgstr ""
 
-#: misc/fsck.c:749
+#: misc/fsck.c:762
 msgid "Couldn't allocate memory for filesystem types\n"
 msgstr ""
 
-#: misc/fsck.c:872
+#: misc/fsck.c:885
 #, c-format
 msgid ""
 "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
 "number\n"
 msgstr ""
 
-#: misc/fsck.c:899
+#: misc/fsck.c:912
 #, c-format
 msgid "fsck: cannot check %s: fsck.%s not found\n"
 msgstr ""
 
-#: misc/fsck.c:955
+#: misc/fsck.c:968
 msgid "Checking all file systems.\n"
 msgstr ""
 
-#: misc/fsck.c:1046
+#: misc/fsck.c:1059
 #, c-format
 msgid "--waiting-- (pass %d)\n"
 msgstr ""
 
-#: misc/fsck.c:1066
+#: misc/fsck.c:1079
 msgid ""
 "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
 msgstr ""
 
-#: misc/fsck.c:1108
+#: misc/fsck.c:1121
 #, c-format
 msgid "%s: too many devices\n"
 msgstr ""
 
-#: misc/fsck.c:1141 misc/fsck.c:1227
+#: misc/fsck.c:1154 misc/fsck.c:1240
 #, c-format
 msgid "%s: too many arguments\n"
 msgstr ""
@@ -3632,7 +3641,7 @@ msgstr ""
 msgid "bad num inodes - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1223 misc/mke2fs.c:1745
+#: misc/mke2fs.c:1223 misc/mke2fs.c:1754
 #, c-format
 msgid "while trying to open journal device %s\n"
 msgstr ""
@@ -3694,25 +3703,32 @@ msgstr ""
 msgid "Journals not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1412
+#: misc/mke2fs.c:1404
+#, 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:1421
 msgid "while trying to determine hardware sector size"
 msgstr ""
 
-#: misc/mke2fs.c:1464
+#: misc/mke2fs.c:1473
 msgid "reserved online resize blocks not supported on non-sparse filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1473
+#: misc/mke2fs.c:1482
 msgid "blocks per group count out of range"
 msgstr ""
 
-#: misc/mke2fs.c:1480
+#: misc/mke2fs.c:1489
 msgid ""
 "Filesystem too large.  No more than 2**31-1 blocks\n"
 "\t (8TB using a blocksize of 4k) are currently supported."
 msgstr ""
 
-#: misc/mke2fs.c:1487
+#: misc/mke2fs.c:1496
 #, c-format
 msgid ""
 "\n"
@@ -3721,27 +3737,27 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1504
+#: misc/mke2fs.c:1513
 #, c-format
 msgid "invalid inode size %d (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1510
+#: misc/mke2fs.c:1519
 #, c-format
 msgid "Warning: %d-byte inodes not usable on older systems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1522
+#: misc/mke2fs.c:1531
 #, c-format
 msgid "too many inodes (%llu), raise inode ratio?"
 msgstr ""
 
-#: misc/mke2fs.c:1527
+#: misc/mke2fs.c:1536
 #, c-format
 msgid "too many inodes (%llu), specify < 2^32 inodes"
 msgstr ""
 
-#: misc/mke2fs.c:1542
+#: misc/mke2fs.c:1551
 #, c-format
 msgid ""
 "inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -3749,62 +3765,62 @@ msgid ""
 "\tor lower inode count (-N).\n"
 msgstr ""
 
-#: misc/mke2fs.c:1591
+#: misc/mke2fs.c:1600
 msgid "while setting up superblock"
 msgstr ""
 
-#: misc/mke2fs.c:1628
+#: misc/mke2fs.c:1637
 #, c-format
 msgid "unknown os - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1682
+#: misc/mke2fs.c:1691
 msgid "while trying to allocate filesystem tables"
 msgstr ""
 
-#: misc/mke2fs.c:1713
+#: misc/mke2fs.c:1722
 #, c-format
 msgid "while zeroing block %u at end of filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1727
+#: misc/mke2fs.c:1736
 msgid "while reserving blocks for online resize"
 msgstr ""
 
-#: misc/mke2fs.c:1738 misc/tune2fs.c:433
+#: misc/mke2fs.c:1747 misc/tune2fs.c:433
 msgid "journal"
 msgstr ""
 
-#: misc/mke2fs.c:1750
+#: misc/mke2fs.c:1759
 #, c-format
 msgid "Adding journal to device %s: "
 msgstr ""
 
-#: misc/mke2fs.c:1757
+#: misc/mke2fs.c:1766
 #, c-format
 msgid ""
 "\n"
 "\twhile trying to add journal to device %s"
 msgstr ""
 
-#: misc/mke2fs.c:1762 misc/mke2fs.c:1788 misc/tune2fs.c:461 misc/tune2fs.c:475
+#: misc/mke2fs.c:1771 misc/mke2fs.c:1797 misc/tune2fs.c:461 misc/tune2fs.c:475
 #, c-format
 msgid "done\n"
 msgstr ""
 
-#: misc/mke2fs.c:1793
+#: misc/mke2fs.c:1802
 #, c-format
 msgid "Writing superblocks and filesystem accounting information: "
 msgstr ""
 
-#: misc/mke2fs.c:1798
+#: misc/mke2fs.c:1807
 #, c-format
 msgid ""
 "\n"
 "Warning, had trouble writing out superblocks."
 msgstr ""
 
-#: misc/mke2fs.c:1801
+#: misc/mke2fs.c:1810
 #, c-format
 msgid ""
 "done\n"
@@ -3931,60 +3947,60 @@ msgstr ""
 msgid "Couldn't parse date/time specifier: %s"
 msgstr ""
 
-#: misc/tune2fs.c:563 misc/tune2fs.c:576
+#: misc/tune2fs.c:564 misc/tune2fs.c:577
 #, c-format
 msgid "bad mounts count - %s"
 msgstr ""
 
-#: misc/tune2fs.c:592
+#: misc/tune2fs.c:593
 #, c-format
 msgid "bad error behavior - %s"
 msgstr ""
 
-#: misc/tune2fs.c:619
+#: misc/tune2fs.c:620
 #, c-format
 msgid "bad gid/group name - %s"
 msgstr ""
 
-#: misc/tune2fs.c:652
+#: misc/tune2fs.c:653
 #, c-format
 msgid "bad interval - %s"
 msgstr ""
 
-#: misc/tune2fs.c:680
+#: misc/tune2fs.c:681
 #, c-format
 msgid "bad reserved block ratio - %s"
 msgstr ""
 
-#: misc/tune2fs.c:695
+#: misc/tune2fs.c:696
 msgid "-o may only be specified once"
 msgstr ""
 
-#: misc/tune2fs.c:705
+#: misc/tune2fs.c:706
 msgid "-O may only be specified once"
 msgstr ""
 
-#: misc/tune2fs.c:715
+#: misc/tune2fs.c:716
 #, c-format
 msgid "bad reserved blocks count - %s"
 msgstr ""
 
-#: misc/tune2fs.c:744
+#: misc/tune2fs.c:745
 #, c-format
 msgid "bad uid/user name - %s"
 msgstr ""
 
-#: misc/tune2fs.c:842
+#: misc/tune2fs.c:843
 #, c-format
 msgid "Invalid RAID stride: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:857
+#: misc/tune2fs.c:858
 #, c-format
 msgid "Invalid RAID stripe-width: %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:867
+#: misc/tune2fs.c:868
 #, c-format
 msgid ""
 "\n"
@@ -4000,90 +4016,90 @@ msgid ""
 "\t^test_fs\n"
 msgstr ""
 
-#: misc/tune2fs.c:927
+#: misc/tune2fs.c:928
 #, c-format
 msgid "Filesystem %s has unsupported features enabled.\n"
 msgstr ""
 
-#: misc/tune2fs.c:951
+#: misc/tune2fs.c:952
 #, c-format
 msgid "Setting maximal mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:957
+#: misc/tune2fs.c:958
 #, c-format
 msgid "Setting current mount count to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:962
+#: misc/tune2fs.c:963
 #, c-format
 msgid "Setting error behavior to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:967
+#: misc/tune2fs.c:968
 #, c-format
 msgid "Setting reserved blocks gid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:972
+#: misc/tune2fs.c:973
 #, c-format
 msgid "Setting interval between checks to %lu seconds\n"
 msgstr ""
 
-#: misc/tune2fs.c:978
+#: misc/tune2fs.c:979
 #, c-format
 msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n"
 msgstr ""
 
-#: misc/tune2fs.c:984
+#: misc/tune2fs.c:985
 #, c-format
 msgid "reserved blocks count is too big (%lu)"
 msgstr ""
 
-#: misc/tune2fs.c:990
+#: misc/tune2fs.c:991
 #, c-format
 msgid "Setting reserved blocks count to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:996
+#: misc/tune2fs.c:997
 msgid ""
 "\n"
 "The filesystem already has sparse superblocks.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1003
+#: misc/tune2fs.c:1004
 #, c-format
 msgid ""
 "\n"
 "Sparse superblock flag set.  %s"
 msgstr ""
 
-#: misc/tune2fs.c:1008
+#: misc/tune2fs.c:1009
 msgid ""
 "\n"
 "Clearing the sparse superflag not supported.\n"
 msgstr ""
 
-#: misc/tune2fs.c:1015
+#: misc/tune2fs.c:1016
 #, c-format
 msgid "Setting time filesystem last checked to %s\n"
 msgstr ""
 
-#: misc/tune2fs.c:1021
+#: misc/tune2fs.c:1022
 #, c-format
 msgid "Setting reserved blocks uid to %lu\n"
 msgstr ""
 
-#: misc/tune2fs.c:1056
+#: misc/tune2fs.c:1057
 msgid "Invalid UUID format\n"
 msgstr ""
 
-#: misc/tune2fs.c:1067
+#: misc/tune2fs.c:1068
 #, c-format
 msgid "Setting stride size to %d\n"
 msgstr ""
 
-#: misc/tune2fs.c:1072
+#: misc/tune2fs.c:1073
 #, c-format
 msgid "Setting stripe width to %d\n"
 msgstr ""
@@ -4281,24 +4297,24 @@ msgid ""
 "\n"
 msgstr ""
 
-#: resize/resize2fs.c:233
+#: resize/resize2fs.c:234
 #, c-format
 msgid "inodes (%llu) must be less than %u"
 msgstr ""
 
-#: resize/resize2fs.c:642
+#: resize/resize2fs.c:643
 msgid "reserved blocks"
 msgstr ""
 
-#: resize/resize2fs.c:647
+#: resize/resize2fs.c:648
 msgid "blocks to be moved"
 msgstr ""
 
-#: resize/resize2fs.c:652
+#: resize/resize2fs.c:653
 msgid "meta-data blocks"
 msgstr ""
 
-#: resize/resize2fs.c:1550
+#: resize/resize2fs.c:1546
 #, c-format
 msgid "Should never happen: resize inode corrupt!\n"
 msgstr ""

diff --git a/version.h b/version.h
index 95704e6..564b8ab 100644 (file)
--- a/version.h
+++ b/version.h
@@ -7,5 +7,5 @@
  * redistributed under the GNU Public License.
  */
 
-#define E2FSPROGS_VERSION "1.40.10"
-#define E2FSPROGS_DATE "21-May-2008"
+#define E2FSPROGS_VERSION "1.40.11"
+#define E2FSPROGS_DATE "17-June-2008"