Update Release Notes, Changelogs, version.h, etc. for 1.41.13 release

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 59a94b2..586e6e6 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -1,10 +1,39 @@
-E2fsprogs 1.41.13 (November 22, 2010)
+E2fsprogs 1.41.13 (December 13, 2010)
 =====================================
 
+E2fsck now supports the extended option "-E journal_only", which
+causes it to only do a journal replay.  This is useful for scripts
+that want to first replay the journal and then check to see if it
+contains errors.
+
+E2fsck will now support UUID= and LABEL= specifiers for the -j option
+(which specifies where to find the external journal).  (Addresses
+Debian Bug #559315)
+
+E2fsck now has support for the problems/<problem code>/force_no
+configuration option in e2fsck.conf, which forces a problem to not be
+fixed.
+
+Dumpe2fs will now avoid printing large negative offsets for the bitmap
+blocks and instead print a message which is a bit more helpful for
+flex_bg file systems.
+
+Mke2fs will now check the file system type (specified with the -t
+option) to make sure it is defined in the mke2fs.conf file; if it is
+not, it will print an error and abort.  If the usage type (specified
+with the -T option) is not defined in mke2fs.conf, mke2fs will print a
+warning but will continue.  (Addresses Debian Bug #594609)
+
+Clarified error message from resize2fs clarifying that on-line
+shrinking is not supported at all.  (Addresses Debian Bug #599786)
+    
+Fix an e2fsck bug that could cause a PROGRAMMING BUG error to be
+displayed.  (Addresses Debian Bug #555456)
+
 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)
+(Addresses Debian Bug #587531)
 
 Fix a bug in e2fsck so it has the correct test for the EOFBLOCKS_FL
 flag.
@@ -80,7 +109,8 @@ alternate superblocks.
 
 Fixed various Debian Packaging Issues
 
-Updated/clarified man pages (Addresses Debian Bugs: #580236, #594004, #589345)
+Updated/clarified man pages (Addresses Debian Bugs: #580236, #594004,
+#589345, #591083; Addresses Launchpad Bug: #505719)
 
 Update the Chinese, Chzech, Dutch, French, Germany, Indonesian,
 Polish, Swedish, and Vietnamese translations.
@@ -89,10 +119,16 @@ Polish, Swedish, and Vietnamese translations.
 Programmer's Notes
 ------------------
 
+Fix a dependency definition for the static and profiled blkid
+libraries which could cause compile failures in some configurations.
+(Addresses Debian Bug: #604629)
+    
 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.
 
+Fixed minor memory leaks in mke2fs.
+
 Added a new function to the ext2fs library, ext2fs_get_memalign().
 
 The tst_super_size test program will check to make sure the superblock

diff --git a/debian/changelog b/debian/changelog
index 844c3ea..b4927ca 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,19 @@
 e2fsprogs (1.41.13-1) unstable; urgency=low
 
   * New upstream release
+  * E2fsck can now do journal-only replays via "e2fsck -E journal_only"
+  * E2fsck now understands UUID= and LABEL= specifiers for the -j option
+    (Closes: #559315)
+  * E2fsck.conf now supports a new config option, which forces the
+    problem not to be fixed: problems/<problem code/force_no
+  * Dumpe2fs now prints friendlier offsets for flex_bg file systems
+  * Mke2fs will now fail if the user uses an file system type not
+    defined in mke2fs.conf (Closes: #594609)
+  * Resize now prints a clarified error message explaining that on-line
+    shrinking is not supported at all.  (Closes: #599786)
+  * Fixed a build error caused by bad static and profiled dependencies
+    for the blkid library (Closes: #604629)
+  * Fixed an e2fsck PROGRAMMING BUG error (Closes: #555456)
   * 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)
@@ -31,7 +44,7 @@ e2fsprogs (1.41.13-1) unstable; urgency=low
     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)
+  * Updated/clarified man pages (Closes: #580236, #594004, #589345, #591083)
 
  -- Theodore Y. Ts'o <tytso@mit.edu>  Mon, 22 Nov 2010 16:00:50 -0400
 

diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo
index 91e34b0..669b7ab 100644 (file)
--- a/doc/libext2fs.texinfo
+++ b/doc/libext2fs.texinfo
@@ -61,7 +61,7 @@ by the author.
 @title The EXT2FS Library
 @subtitle The EXT2FS Library
 @subtitle Version 1.41.13
-@subtitle November 2010
+@subtitle December 2010
 
 @author by Theodore Ts'o
 

diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm
index 22286d0..991e609 100644 (file)
--- a/e2fsprogs.lsm
+++ b/e2fsprogs.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title:          EXT2 Filesystem utilities
 Version:        1.41.13
-Entered-date:   22Nov2010
+Entered-date:   13Dec2010
 Description:    The filesystem utilities for the EXT2 filesystem, including 
                e2fsck, mke2fs, dumpe2fs, fsck, and others.
 Keywords:       utilities, fsck, filesystem, Ext2fs

diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot
index 37f6adc..d0b1e12 100644 (file)
--- a/po/e2fsprogs.pot
+++ b/po/e2fsprogs.pot
@@ -67,7 +67,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: e2fsprogs 1.41.13\n"
 "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
-"POT-Creation-Date: 2010-11-22 15:26-0500\n"
+"POT-Creation-Date: 2010-12-13 08:35-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,9 +89,9 @@ msgid "while reading the bad blocks inode"
 msgstr ""
 
 #: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109
-#: e2fsck/unix.c:1085 e2fsck/unix.c:1170 misc/badblocks.c:1158
+#: e2fsck/unix.c:1103 e2fsck/unix.c:1188 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/dumpe2fs.c:566 misc/e2image.c:583 misc/e2image.c:679
 #: misc/e2image.c:695 misc/mke2fs.c:185 misc/tune2fs.c:1623 resize/main.c:310
 #, c-format
 msgid "while trying to open %s"
@@ -186,12 +186,12 @@ msgstr ""
 msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n"
 msgstr ""
 
-#: e2fsck/iscan.c:83 e2fsck/unix.c:838
+#: e2fsck/iscan.c:83 e2fsck/unix.c:856
 #, c-format
 msgid "while opening %s for flushing"
 msgstr ""
 
-#: e2fsck/iscan.c:88 e2fsck/unix.c:844 resize/main.c:286
+#: e2fsck/iscan.c:88 e2fsck/unix.c:862 resize/main.c:286
 #, c-format
 msgid "while trying to flush %s"
 msgstr ""
@@ -579,7 +579,7 @@ msgstr ""
 msgid "inode loop detection bitmap"
 msgstr ""
 
-#: e2fsck/pass4.c:191
+#: e2fsck/pass4.c:193
 msgid "Pass 4"
 msgstr ""
 
@@ -2353,7 +2353,7 @@ msgstr ""
 msgid "Unhandled error code (0x%x)!\n"
 msgstr ""
 
-#: e2fsck/problem.c:1850
+#: e2fsck/problem.c:1855
 msgid "IGNORED"
 msgstr ""
 
@@ -2483,124 +2483,125 @@ msgstr ""
 msgid "check aborted.\n"
 msgstr ""
 
-#: e2fsck/unix.c:315
+#: e2fsck/unix.c:318
 msgid " contains a file system with errors"
 msgstr ""
 
-#: e2fsck/unix.c:317
+#: e2fsck/unix.c:320
 msgid " was not cleanly unmounted"
 msgstr ""
 
-#: e2fsck/unix.c:319
+#: e2fsck/unix.c:322
 msgid " primary superblock features different from backup"
 msgstr ""
 
-#: e2fsck/unix.c:323
+#: e2fsck/unix.c:326
 #, c-format
 msgid " has been mounted %u times without being checked"
 msgstr ""
 
-#: e2fsck/unix.c:330
+#: e2fsck/unix.c:333
 msgid " has filesystem last checked time in the future"
 msgstr ""
 
-#: e2fsck/unix.c:336
+#: e2fsck/unix.c:339
 #, c-format
 msgid " has gone %u days without being checked"
 msgstr ""
 
-#: e2fsck/unix.c:345
+#: e2fsck/unix.c:348
 msgid ", check forced.\n"
 msgstr ""
 
-#: e2fsck/unix.c:348
+#: e2fsck/unix.c:351
 #, c-format
 msgid "%s: clean, %u/%u files, %u/%u blocks"
 msgstr ""
 
-#: e2fsck/unix.c:365
+#: e2fsck/unix.c:368
 msgid " (check deferred; on battery)"
 msgstr ""
 
-#: e2fsck/unix.c:368
+#: e2fsck/unix.c:371
 msgid " (check after next mount)"
 msgstr ""
 
-#: e2fsck/unix.c:370
+#: e2fsck/unix.c:373
 #, c-format
 msgid " (check in %ld mounts)"
 msgstr ""
 
-#: e2fsck/unix.c:517
+#: e2fsck/unix.c:521
 #, c-format
 msgid "ERROR: Couldn't open /dev/null (%s)\n"
 msgstr ""
 
-#: e2fsck/unix.c:587
+#: e2fsck/unix.c:591
 #, c-format
 msgid "Invalid EA version.\n"
 msgstr ""
 
-#: e2fsck/unix.c:596
+#: e2fsck/unix.c:606
 #, c-format
 msgid "Unknown extended option: %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:618
+#: e2fsck/unix.c:629
 #, c-format
 msgid ""
 "Syntax error in e2fsck config file (%s, line #%d)\n"
 "\t%s\n"
 msgstr ""
 
-#: e2fsck/unix.c:686
+#: e2fsck/unix.c:697
 #, c-format
 msgid "Error validating file descriptor %d: %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:690
+#: e2fsck/unix.c:701
 msgid "Invalid completion information file descriptor"
 msgstr ""
 
-#: e2fsck/unix.c:705
+#: e2fsck/unix.c:716
 msgid "Only one of the options -p/-a, -n or -y may be specified."
 msgstr ""
 
-#: e2fsck/unix.c:726
+#: e2fsck/unix.c:737
 #, c-format
 msgid "The -t option is not supported on this version of e2fsck.\n"
 msgstr ""
 
-#: e2fsck/unix.c:801
+#: e2fsck/unix.c:768 e2fsck/unix.c:840 misc/tune2fs.c:588 misc/tune2fs.c:873
+#: misc/tune2fs.c:891
+#, c-format
+msgid "Unable to resolve '%s'"
+msgstr ""
+
+#: e2fsck/unix.c:819
 msgid "The -n and -D options are incompatible."
 msgstr ""
 
-#: e2fsck/unix.c:806
+#: e2fsck/unix.c:824
 msgid "The -n and -c options are incompatible."
 msgstr ""
 
-#: e2fsck/unix.c:811
+#: e2fsck/unix.c:829
 msgid "The -n and -l/-L options are incompatible."
 msgstr ""
 
-#: e2fsck/unix.c:822 misc/tune2fs.c:588 misc/tune2fs.c:873 misc/tune2fs.c:891
-#, c-format
-msgid "Unable to resolve '%s'"
-msgstr ""
-
-#: e2fsck/unix.c:851
+#: e2fsck/unix.c:869
 #, c-format
 msgid "The -c and the -l/-L options may not be both used at the same time.\n"
 msgstr ""
 
-#: e2fsck/unix.c:899
+#: e2fsck/unix.c:917
 #, c-format
 msgid ""
 "E2FSCK_JBD_DEBUG \"%s\" not an integer\n"
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:908
+#: e2fsck/unix.c:926
 #, c-format
 msgid ""
 "\n"
@@ -2608,43 +2609,43 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:982
+#: e2fsck/unix.c:1000
 #, c-format
 msgid "Error: ext2fs library version out of date!\n"
 msgstr ""
 
-#: e2fsck/unix.c:990
+#: e2fsck/unix.c:1008
 msgid "while trying to initialize program"
 msgstr ""
 
-#: e2fsck/unix.c:1001
+#: e2fsck/unix.c:1019
 #, c-format
 msgid "\tUsing %s, %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1013
+#: e2fsck/unix.c:1031
 msgid "need terminal for interactive repairs"
 msgstr ""
 
-#: e2fsck/unix.c:1046
+#: e2fsck/unix.c:1064
 #, c-format
 msgid "%s: %s trying backup blocks...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1048
+#: e2fsck/unix.c:1066
 msgid "Superblock invalid,"
 msgstr ""
 
-#: e2fsck/unix.c:1049
+#: e2fsck/unix.c:1067
 msgid "Group descriptors look bad..."
 msgstr ""
 
-#: e2fsck/unix.c:1061
+#: e2fsck/unix.c:1079
 #, c-format
 msgid "%s: going back to original superblock\n"
 msgstr ""
 
-#: e2fsck/unix.c:1088
+#: e2fsck/unix.c:1106
 #, c-format
 msgid ""
 "The filesystem revision is apparently too high for this version of e2fsck.\n"
@@ -2652,147 +2653,147 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1094
+#: e2fsck/unix.c:1112
 #, c-format
 msgid "Could this be a zero-length partition?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1096
+#: e2fsck/unix.c:1114
 #, c-format
 msgid "You must have %s access to the filesystem or be root\n"
 msgstr ""
 
-#: e2fsck/unix.c:1101
+#: e2fsck/unix.c:1119
 #, c-format
 msgid "Possibly non-existent or swap device?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1103
+#: e2fsck/unix.c:1121
 #, c-format
 msgid "Filesystem mounted or opened exclusively by another program?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1106
+#: e2fsck/unix.c:1124
 #, c-format
 msgid "Possibly non-existent device?\n"
 msgstr ""
 
-#: e2fsck/unix.c:1109
+#: e2fsck/unix.c:1127
 #, 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:1173
+#: e2fsck/unix.c:1191
 msgid "Get a newer version of e2fsck!"
 msgstr ""
 
-#: e2fsck/unix.c:1203
+#: e2fsck/unix.c:1221
 #, c-format
 msgid "while checking ext3 journal for %s"
 msgstr ""
 
-#: e2fsck/unix.c:1214
+#: e2fsck/unix.c:1232
 #, c-format
 msgid ""
 "Warning: skipping journal recovery because doing a read-only filesystem "
 "check.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1227
+#: e2fsck/unix.c:1245
 #, c-format
 msgid "unable to set superblock flags on %s\n"
 msgstr ""
 
-#: e2fsck/unix.c:1233
+#: e2fsck/unix.c:1251
 #, c-format
 msgid "while recovering ext3 journal of %s"
 msgstr ""
 
-#: e2fsck/unix.c:1258
+#: e2fsck/unix.c:1276
 #, c-format
 msgid "%s has unsupported feature(s):"
 msgstr ""
 
-#: e2fsck/unix.c:1274
+#: e2fsck/unix.c:1292
 msgid "Warning: compression support is experimental.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1279
+#: e2fsck/unix.c:1297
 #, c-format
 msgid ""
 "E2fsck not compiled with HTREE support,\n"
 "\tbut filesystem %s has HTREE directories.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1332
+#: e2fsck/unix.c:1350
 msgid "while reading bad blocks inode"
 msgstr ""
 
-#: e2fsck/unix.c:1334
+#: e2fsck/unix.c:1352
 #, c-format
 msgid "This doesn't bode well, but we'll try to go on...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1360
+#: e2fsck/unix.c:1378
 msgid "Couldn't determine journal size"
 msgstr ""
 
-#: e2fsck/unix.c:1363
+#: e2fsck/unix.c:1381
 #, c-format
 msgid "Creating journal (%d blocks): "
 msgstr ""
 
-#: e2fsck/unix.c:1370 misc/mke2fs.c:2304
+#: e2fsck/unix.c:1388 misc/mke2fs.c:2344
 msgid ""
 "\n"
 "\twhile trying to create journal"
 msgstr ""
 
-#: e2fsck/unix.c:1373
+#: e2fsck/unix.c:1391
 #, c-format
 msgid " Done.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1374
+#: e2fsck/unix.c:1392
 #, c-format
 msgid ""
 "\n"
 "*** journal has been re-created - filesystem is now ext3 again ***\n"
 msgstr ""
 
-#: e2fsck/unix.c:1381
+#: e2fsck/unix.c:1399
 #, c-format
 msgid "Restarting e2fsck from the beginning...\n"
 msgstr ""
 
-#: e2fsck/unix.c:1385
+#: e2fsck/unix.c:1403
 msgid "while resetting context"
 msgstr ""
 
-#: e2fsck/unix.c:1392
+#: e2fsck/unix.c:1410
 #, c-format
 msgid "%s: e2fsck canceled.\n"
 msgstr ""
 
-#: e2fsck/unix.c:1397
+#: e2fsck/unix.c:1415
 msgid "aborted"
 msgstr ""
 
-#: e2fsck/unix.c:1409
+#: e2fsck/unix.c:1427
 #, c-format
 msgid ""
 "\n"
 "%s: ***** FILE SYSTEM WAS MODIFIED *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1412
+#: e2fsck/unix.c:1430
 #, c-format
 msgid "%s: ***** REBOOT LINUX *****\n"
 msgstr ""
 
-#: e2fsck/unix.c:1420
+#: e2fsck/unix.c:1438
 #, c-format
 msgid ""
 "\n"
@@ -2800,7 +2801,7 @@ msgid ""
 "\n"
 msgstr ""
 
-#: e2fsck/unix.c:1460
+#: e2fsck/unix.c:1478
 msgid "while setting block group checksum info"
 msgstr ""
 
@@ -3168,111 +3169,111 @@ msgstr ""
 msgid "Usage: %s [-bfhixV] [-o superblock=<num>] [-o blocksize=<num>] device\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:168
+#: misc/dumpe2fs.c:182
 #, c-format
 msgid "Group %lu: (Blocks "
 msgstr ""
 
-#: misc/dumpe2fs.c:173
+#: misc/dumpe2fs.c:187
 #, c-format
 msgid "  Checksum 0x%04x, unused inodes %d\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:178
+#: misc/dumpe2fs.c:192
 #, c-format
 msgid "  %s superblock at "
 msgstr ""
 
-#: misc/dumpe2fs.c:179
+#: misc/dumpe2fs.c:193
 msgid "Primary"
 msgstr ""
 
-#: misc/dumpe2fs.c:179
+#: misc/dumpe2fs.c:193
 msgid "Backup"
 msgstr ""
 
-#: misc/dumpe2fs.c:183
+#: misc/dumpe2fs.c:197
 #, c-format
 msgid ", Group descriptors at "
 msgstr ""
 
-#: misc/dumpe2fs.c:187
+#: misc/dumpe2fs.c:201
 #, c-format
 msgid ""
 "\n"
 "  Reserved GDT blocks at "
 msgstr ""
 
-#: misc/dumpe2fs.c:194
+#: misc/dumpe2fs.c:208
 #, c-format
 msgid " Group descriptor at "
 msgstr ""
 
-#: misc/dumpe2fs.c:200
+#: misc/dumpe2fs.c:214
 msgid "  Block bitmap at "
 msgstr ""
 
-#: misc/dumpe2fs.c:205
+#: misc/dumpe2fs.c:219
 msgid ", Inode bitmap at "
 msgstr ""
 
-#: misc/dumpe2fs.c:210
+#: misc/dumpe2fs.c:224
 msgid ""
 "\n"
 "  Inode table at "
 msgstr ""
 
-#: misc/dumpe2fs.c:217
+#: misc/dumpe2fs.c:231
 #, c-format
 msgid ""
 "\n"
 "  %u free blocks, %u free inodes, %u directories%s"
 msgstr ""
 
-#: misc/dumpe2fs.c:224
+#: misc/dumpe2fs.c:238
 #, c-format
 msgid ", %u unused inodes\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:227
+#: misc/dumpe2fs.c:241
 msgid "  Free blocks: "
 msgstr ""
 
-#: misc/dumpe2fs.c:237
+#: misc/dumpe2fs.c:251
 msgid "  Free inodes: "
 msgstr ""
 
-#: misc/dumpe2fs.c:268
+#: misc/dumpe2fs.c:282
 msgid "while printing bad block list"
 msgstr ""
 
-#: misc/dumpe2fs.c:274
+#: misc/dumpe2fs.c:288
 #, c-format
 msgid "Bad blocks: %u"
 msgstr ""
 
-#: misc/dumpe2fs.c:301 misc/tune2fs.c:281
+#: misc/dumpe2fs.c:315 misc/tune2fs.c:281
 msgid "while reading journal inode"
 msgstr ""
 
-#: misc/dumpe2fs.c:307
+#: misc/dumpe2fs.c:321
 msgid "while opening journal inode"
 msgstr ""
 
-#: misc/dumpe2fs.c:313
+#: misc/dumpe2fs.c:327
 msgid "while reading journal super block"
 msgstr ""
 
-#: misc/dumpe2fs.c:323
+#: misc/dumpe2fs.c:337
 #, c-format
 msgid "Journal features:        "
 msgstr ""
 
-#: misc/dumpe2fs.c:336
+#: misc/dumpe2fs.c:350
 msgid "Journal size:             "
 msgstr ""
 
-#: misc/dumpe2fs.c:347
+#: misc/dumpe2fs.c:361
 #, c-format
 msgid ""
 "Journal length:           %u\n"
@@ -3280,15 +3281,15 @@ msgid ""
 "Journal start:            %u\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:366 misc/tune2fs.c:202
+#: misc/dumpe2fs.c:380 misc/tune2fs.c:202
 msgid "while reading journal superblock"
 msgstr ""
 
-#: misc/dumpe2fs.c:374
+#: misc/dumpe2fs.c:388
 msgid "Couldn't find journal superblock magic numbers"
 msgstr ""
 
-#: misc/dumpe2fs.c:378
+#: misc/dumpe2fs.c:392
 #, c-format
 msgid ""
 "\n"
@@ -3300,27 +3301,27 @@ msgid ""
 "Journal number of users:  %u\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:391
+#: misc/dumpe2fs.c:405
 #, c-format
 msgid "Journal users:            %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:407 misc/mke2fs.c:700 misc/tune2fs.c:910
+#: misc/dumpe2fs.c:421 misc/mke2fs.c:700 misc/tune2fs.c:910
 #, c-format
 msgid "Couldn't allocate memory to parse options!\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:433
+#: misc/dumpe2fs.c:447
 #, c-format
 msgid "Invalid superblock parameter: %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:448
+#: misc/dumpe2fs.c:462
 #, c-format
 msgid "Invalid blocksize parameter: %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:459
+#: misc/dumpe2fs.c:473
 #, c-format
 msgid ""
 "\n"
@@ -3334,18 +3335,18 @@ msgid ""
 "\tblocksize=<blocksize>\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:518 misc/mke2fs.c:1424
+#: misc/dumpe2fs.c:532 misc/mke2fs.c:1462
 #, c-format
 msgid "\tUsing %s\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:554 misc/e2image.c:681 misc/tune2fs.c:1626
+#: misc/dumpe2fs.c:568 misc/e2image.c:681 misc/tune2fs.c:1626
 #: resize/main.c:312
 #, c-format
 msgid "Couldn't find valid filesystem superblock.\n"
 msgstr ""
 
-#: misc/dumpe2fs.c:579
+#: misc/dumpe2fs.c:593
 #, c-format
 msgid ""
 "\n"
@@ -3851,145 +3852,158 @@ msgstr ""
 msgid "Invalid filesystem option set: %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:992
+#: misc/mke2fs.c:1019
 #, c-format
 msgid ""
 "\n"
-"Warning!  Your mke2fs.conf file does not define the %s filesystem type.\n"
+"Your mke2fs.conf file does not define the %s filesystem type.\n"
 msgstr ""
 
-#: misc/mke2fs.c:995
+#: misc/mke2fs.c:1023
 #, c-format
 msgid ""
 "You probably need to install an updated mke2fs.conf file.\n"
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1238
+#: misc/mke2fs.c:1027
+#, c-format
+msgid "Aborting...\n"
+msgstr ""
+
+#: misc/mke2fs.c:1064
+#, c-format
+msgid ""
+"\n"
+"Warning: the fs_type %s is not defined in /etc/mke2fs.conf\n"
+"\n"
+msgstr ""
+
+#: misc/mke2fs.c:1276
 #, c-format
 msgid "invalid block size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1242
+#: misc/mke2fs.c:1280
 #, c-format
 msgid "Warning: blocksize %d not usable on most systems.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1258
+#: misc/mke2fs.c:1296
 #, c-format
 msgid "invalid fragment size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1264
+#: misc/mke2fs.c:1302
 #, c-format
 msgid "Warning: fragments not supported.  Ignoring -f option\n"
 msgstr ""
 
-#: misc/mke2fs.c:1271
+#: misc/mke2fs.c:1309
 msgid "Illegal number for blocks per group"
 msgstr ""
 
-#: misc/mke2fs.c:1276
+#: misc/mke2fs.c:1314
 msgid "blocks per group must be multiple of 8"
 msgstr ""
 
-#: misc/mke2fs.c:1284
+#: misc/mke2fs.c:1322
 msgid "Illegal number for flex_bg size"
 msgstr ""
 
-#: misc/mke2fs.c:1290
+#: misc/mke2fs.c:1328
 msgid "flex_bg size must be a power of 2"
 msgstr ""
 
-#: misc/mke2fs.c:1300
+#: misc/mke2fs.c:1338
 #, c-format
 msgid "invalid inode ratio %s (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1310
+#: misc/mke2fs.c:1348
 #, 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
+#: misc/mke2fs.c:1362
 msgid "in malloc for bad_blocks_filename"
 msgstr ""
 
-#: misc/mke2fs.c:1334
+#: misc/mke2fs.c:1372
 #, c-format
 msgid "invalid reserved blocks percent - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1352
+#: misc/mke2fs.c:1390
 #, c-format
 msgid "bad revision level - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1364
+#: misc/mke2fs.c:1402
 #, c-format
 msgid "invalid inode size - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1384
+#: misc/mke2fs.c:1422
 #, c-format
 msgid "bad num inodes - %s"
 msgstr ""
 
-#: misc/mke2fs.c:1449 misc/mke2fs.c:2259
+#: misc/mke2fs.c:1487 misc/mke2fs.c:2299
 #, c-format
 msgid "while trying to open journal device %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1455
+#: misc/mke2fs.c:1493
 #, c-format
 msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1461
+#: misc/mke2fs.c:1499
 #, c-format
 msgid "Using journal device's blocksize: %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1470
+#: misc/mke2fs.c:1508
 #, c-format
 msgid "%d-byte blocks too big for system (max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1474
+#: misc/mke2fs.c:1512
 #, c-format
 msgid ""
 "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
 msgstr ""
 
-#: misc/mke2fs.c:1483
+#: misc/mke2fs.c:1521
 #, c-format
 msgid "invalid blocks count '%s' on device '%s'"
 msgstr ""
 
-#: misc/mke2fs.c:1493
+#: misc/mke2fs.c:1531
 msgid "filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1529
+#: misc/mke2fs.c:1567
 #, 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:1538 resize/main.c:381
+#: misc/mke2fs.c:1576 resize/main.c:381
 msgid "while trying to determine filesystem size"
 msgstr ""
 
-#: misc/mke2fs.c:1545
+#: misc/mke2fs.c:1583
 msgid ""
 "Couldn't determine device size; you must specify\n"
 "the size of the filesystem\n"
 msgstr ""
 
-#: misc/mke2fs.c:1552
+#: misc/mke2fs.c:1590
 msgid ""
 "Device size reported to be zero.  Invalid partition specified, or\n"
 "\tpartition table wasn't reread after running fdisk, due to\n"
@@ -3997,103 +4011,103 @@ msgid ""
 "\tto re-read your partition table.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1570
+#: misc/mke2fs.c:1608
 msgid "Filesystem larger than apparent device size."
 msgstr ""
 
-#: misc/mke2fs.c:1576
+#: misc/mke2fs.c:1614
 #, c-format
 msgid "Failed to parse fs types list\n"
 msgstr ""
 
-#: misc/mke2fs.c:1610
+#: misc/mke2fs.c:1648
 msgid "fs_types for mke2fs.conf resolution: "
 msgstr ""
 
-#: misc/mke2fs.c:1617
+#: misc/mke2fs.c:1655
 #, c-format
 msgid "Filesystem features not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1624
+#: misc/mke2fs.c:1662
 #, c-format
 msgid "Sparse superblocks not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1636
+#: misc/mke2fs.c:1674
 #, c-format
 msgid "Journals not supported with revision 0 filesystems\n"
 msgstr ""
 
-#: misc/mke2fs.c:1654
+#: misc/mke2fs.c:1692
 #, 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:1671
+#: misc/mke2fs.c:1709
 msgid "while trying to determine hardware sector size"
 msgstr ""
 
-#: misc/mke2fs.c:1677
+#: misc/mke2fs.c:1715
 msgid "while trying to determine physical sector size"
 msgstr ""
 
-#: misc/mke2fs.c:1708
+#: misc/mke2fs.c:1746
 msgid "while setting blocksize; too small for device\n"
 msgstr ""
 
-#: misc/mke2fs.c:1713
+#: misc/mke2fs.c:1751
 #, c-format
 msgid ""
 "Warning: specified blocksize %d is less than device physical sectorsize %d\n"
 msgstr ""
 
-#: misc/mke2fs.c:1733
+#: misc/mke2fs.c:1771
 #, c-format
 msgid "warning: Unable to get device geometry for %s\n"
 msgstr ""
 
-#: misc/mke2fs.c:1736
+#: misc/mke2fs.c:1774
 #, c-format
 msgid "%s alignment is offset by %lu bytes.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1738
+#: misc/mke2fs.c:1776
 #, c-format
 msgid ""
 "This may result in very poor performance, (re)-partitioning suggested.\n"
 msgstr ""
 
-#: misc/mke2fs.c:1771
+#: misc/mke2fs.c:1810
 msgid "reserved online resize blocks not supported on non-sparse filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:1780
+#: misc/mke2fs.c:1819
 msgid "blocks per group count out of range"
 msgstr ""
 
-#: misc/mke2fs.c:1795
+#: misc/mke2fs.c:1834
 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
 msgstr ""
 
-#: misc/mke2fs.c:1807
+#: misc/mke2fs.c:1846
 #, c-format
 msgid "invalid inode size %d (min %d/max %d)"
 msgstr ""
 
-#: misc/mke2fs.c:1821
+#: misc/mke2fs.c:1860
 #, c-format
 msgid "too many inodes (%llu), raise inode ratio?"
 msgstr ""
 
-#: misc/mke2fs.c:1826
+#: misc/mke2fs.c:1865
 #, c-format
 msgid "too many inodes (%llu), specify < 2^32 inodes"
 msgstr ""
 
-#: misc/mke2fs.c:1841
+#: misc/mke2fs.c:1880
 #, c-format
 msgid ""
 "inode_size (%u) * inodes_count (%u) too big for a\n"
@@ -4101,16 +4115,16 @@ msgid ""
 "\tor lower inode count (-N).\n"
 msgstr ""
 
-#: misc/mke2fs.c:1934 misc/tune2fs.c:1544
+#: misc/mke2fs.c:1973 misc/tune2fs.c:1544
 msgid "Couldn't allocate memory for tdb filename\n"
 msgstr ""
 
-#: misc/mke2fs.c:1947 misc/tune2fs.c:1566
+#: misc/mke2fs.c:1986 misc/tune2fs.c:1566
 #, c-format
 msgid "while trying to delete %s"
 msgstr ""
 
-#: misc/mke2fs.c:1957
+#: misc/mke2fs.c:1996
 #, c-format
 msgid ""
 "Overwriting existing filesystem; this can be undone using the command:\n"
@@ -4118,92 +4132,92 @@ msgid ""
 "\n"
 msgstr ""
 
-#: misc/mke2fs.c:1997
+#: misc/mke2fs.c:2036
 #, c-format
 msgid "Calling BLKDISCARD from %llu to %llu "
 msgstr ""
 
-#: misc/mke2fs.c:2001
+#: misc/mke2fs.c:2040
 #, c-format
 msgid "failed.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2003
+#: misc/mke2fs.c:2042
 #, c-format
 msgid "succeeded.\n"
 msgstr ""
 
-#: misc/mke2fs.c:2070
+#: misc/mke2fs.c:2109
 msgid "while setting up superblock"
 msgstr ""
 
-#: misc/mke2fs.c:2080
+#: misc/mke2fs.c:2119
 #, c-format
 msgid "Discard succeeded and will return 0s  - skipping inode table wipe\n"
 msgstr ""
 
-#: misc/mke2fs.c:2143
+#: misc/mke2fs.c:2183
 #, c-format
 msgid "unknown os - %s"
 msgstr ""
 
-#: misc/mke2fs.c:2197
+#: misc/mke2fs.c:2237
 msgid "while trying to allocate filesystem tables"
 msgstr ""
 
-#: misc/mke2fs.c:2228
+#: misc/mke2fs.c:2268
 #, c-format
 msgid "while zeroing block %u at end of filesystem"
 msgstr ""
 
-#: misc/mke2fs.c:2241
+#: misc/mke2fs.c:2281
 msgid "while reserving blocks for online resize"
 msgstr ""
 
-#: misc/mke2fs.c:2252 misc/tune2fs.c:517
+#: misc/mke2fs.c:2292 misc/tune2fs.c:517
 msgid "journal"
 msgstr ""
 
-#: misc/mke2fs.c:2264
+#: misc/mke2fs.c:2304
 #, c-format
 msgid "Adding journal to device %s: "
 msgstr ""
 
-#: misc/mke2fs.c:2271
+#: misc/mke2fs.c:2311
 #, c-format
 msgid ""
 "\n"
 "\twhile trying to add journal to device %s"
 msgstr ""
 
-#: misc/mke2fs.c:2276 misc/mke2fs.c:2308 misc/tune2fs.c:546 misc/tune2fs.c:560
+#: misc/mke2fs.c:2316 misc/mke2fs.c:2348 misc/tune2fs.c:546 misc/tune2fs.c:560
 #, c-format
 msgid "done\n"
 msgstr ""
 
-#: misc/mke2fs.c:2285
+#: misc/mke2fs.c:2325
 #, c-format
 msgid "Skipping journal creation in super-only mode\n"
 msgstr ""
 
-#: misc/mke2fs.c:2296
+#: misc/mke2fs.c:2336
 #, c-format
 msgid "Creating journal (%u blocks): "
 msgstr ""
 
-#: misc/mke2fs.c:2313
+#: misc/mke2fs.c:2353
 #, c-format
 msgid "Writing superblocks and filesystem accounting information: "
 msgstr ""
 
-#: misc/mke2fs.c:2318
+#: misc/mke2fs.c:2358
 #, c-format
 msgid ""
 "\n"
 "Warning, had trouble writing out superblocks."
 msgstr ""
 
-#: misc/mke2fs.c:2321
+#: misc/mke2fs.c:2361
 #, c-format
 msgid ""
 "done\n"
@@ -4846,46 +4860,45 @@ msgid "Filesystem at %s is mounted on %s; on-line resizing required\n"
 msgstr ""
 
 #: resize/online.c:41
-#, c-format
-msgid "On-line shrinking from %u to %u not supported.\n"
+msgid "On-line shrinking not supported"
 msgstr ""
 
-#: resize/online.c:61
+#: resize/online.c:60
 msgid "Filesystem does not support online resizing"
 msgstr ""
 
-#: resize/online.c:68
+#: resize/online.c:67
 #, c-format
 msgid "while trying to open mountpoint %s"
 msgstr ""
 
-#: resize/online.c:76
+#: resize/online.c:75
 msgid "Permission denied to resize filesystem"
 msgstr ""
 
-#: resize/online.c:79
+#: resize/online.c:78
 msgid "Kernel does not support online resizing"
 msgstr ""
 
-#: resize/online.c:82
+#: resize/online.c:81
 msgid "While checking for on-line resizing support"
 msgstr ""
 
-#: resize/online.c:111
+#: resize/online.c:110
 #, c-format
 msgid "Performing an on-line resize of %s to %u (%dk) blocks.\n"
 msgstr ""
 
-#: resize/online.c:121
+#: resize/online.c:120
 msgid "While trying to extend the last group"
 msgstr ""
 
-#: resize/online.c:180
+#: resize/online.c:179
 #, c-format
 msgid "While trying to add group #%d"
 msgstr ""
 
-#: resize/online.c:191
+#: resize/online.c:190
 #, c-format
 msgid ""
 "Filesystem at %s is mounted on %s, and on-line resizing is not supported on "

diff --git a/version.h b/version.h
index 0469319..156db11 100644 (file)
--- a/version.h
+++ b/version.h
@@ -8,4 +8,4 @@
  */
 
 #define E2FSPROGS_VERSION "1.41.13"
-#define E2FSPROGS_DATE "22-Nov-2010"
+#define E2FSPROGS_DATE "13-Dec-2010"