From 9080695a4ec602b1102d836b44b18c2ec692c12e Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 10 Feb 2010 15:49:32 -0500 Subject: [PATCH] Update release notes, version string, etc. for e2fsprogs 1.41.10 release Signed-off-by: "Theodore Ts'o" --- README | 2 +- RELEASE-NOTES | 135 ++++++ debian/changelog | 69 +++ doc/libext2fs.texinfo | 8 +- e2fsprogs.lsm | 10 +- po/e2fsprogs.pot | 1199 +++++++++++++++++++++++++++---------------------- version.h | 4 +- 7 files changed, 875 insertions(+), 552 deletions(-) diff --git a/README b/README index 73ea7d6b..9cd68d91 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - This is the new version (1.41.9) of the second extended file + This is the new version (1.41.10) 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 77045e16..7d2993c8 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1,3 +1,138 @@ +E2fsprogs 1.41.10 (February 7, 2010) +==================================== + +Fix resize2fs bug which causes it to access invalid memory. + +Add libss support for libreadline.so.6. + +Fix e2fsck's check for extent-mapped directory with an incorrect file +type. + +Add new e2fsck.conf configuration option, default/broken_system_clock +to support systems with broken CMOS hardware clocks. Also, since too +many distributions seem to have broken virtualization scripts now, +e2fsck will by default accept dates which are off by up to 24 hours by +default. (Addresses Debian Bugs: #559776, #557636) + +Fix a bug where mke2fs may not use the best placement of the inode +table when there is only room for a single block group in the last +flex_bg. + +E2fsck is now smarter when it needs to allocate blocks in the course +of fixing file system problems. This reduces the number of spurious +differences found in pass #5. + +E2fsck will no longer rehash directories which fit in a single +directory block. + +E2fsck now correctly handles holes in extent-mapped directories (i.e., +sparse directories which use extents). + +Fix big-endian problems with ext2fs_bmap() and ext2fs_bmap2(). + +Fix a bug in filefrag where on platforms which can allow file systems +with 8k blocks, that it doesn't core dump when it sees a file system +with 8k block sizes. (Thanks to Mikulas Patocka for pointing this +out.) + +E2fsck will correctly fix directories that are have an inaccurate +i_size as well as other problems in a single pass, instead of +requiring two e2fsck runs before the file system is fully fixed. + +Fix e2fsck so it will correctly find and detect duplicate directory +entries for non-indexed directories. ( Addresses Sourceforge Bug: +#2862551) + +Mke2fs will use BLKDISCARD to pre-discard all blocks on an SSD or +thinly-provisioned storage device. This can be disabled using the -K +option. + +Enhance libext2fs so it works around bug in Linux version 2.6.19 +and earlier where the /proc/swaps file was missing the header on +the first line. + +Fix bug in Linux version 2.6.19 and earlier where the /proc/swaps file +was missing the header on the first line. + +Fix some big-endian bugs in e2fsck and libext2fs. + +Fix resize2fs so it works correctly on file systems with external +journals instead of failing early with the error "Illegal inode +number". + +Fix libss so that it does not seg fault when using a readline library +which does not supply a readline_shutdown() function. + +Updated dumpe2fs's usage message so it correctly gives the right +arguments summary for "-o superblock=" and "-o blocksize=". +(Addresses Launchpad Bug: #448099) + +Teach libext2fs to ignore the high 32 bits of the i_blocks field +when huge_file file system feature is set, but the inode does not +have the HUGE_FILE_FL flag set. + +Fix e2fsck's handling of 64-bit i_blocks fields. + +E2fsck will now print "Illegal indirect block", "Illegal +double-indirect block", etc., instead of "Illegal block #-1" or +"Illegal block #-2", etc. This makes it easier for users to +understand what has gone wrong. (Addresses SourceForge Bug: #2871782) + +Mke2fs now will obtain get device topology information from blkid and +use it to populate the superblock stride and stripe sizes. It will +also warn if the block device is misaligned + +Fix file descriptor leaks in fsck and debugfs. (Addresses Novell Bug: +##524526) + +Fix the libext2fs library code to round up the bitmap size to a 4-byte +boundary, to prevent spurious seg faults caused by the x86 +architecture. This doesn't affect Linux systems, but was a major +problem on a number of *BSD systems. (Addresses Sourceforge Bug: +#2328708) + +Fix resize2fs's minimum size required for a file system so it doesn't +fail when "resize2fs -M" is run. (Addresses RedHat Bugzilla: #519131) + +Dumpe2fs now prints summary information about the contents of the +journal. + +Avoid printing scary error messages when e2fsck starts running +problems on low-memory systems, as it tends to panic and mislead the +user. (Addresses Debian Bug: #509529) + +Fix blkid's modules.dep parser so it handles compressed (.ko.gz) +modules files. (Address Red Hat Bug: #518572) + +Fix tune2fs so it can add a journal when an extent-enabled file system +is mounted. (Addresses Launchpad bug: #416648) + +Update Czech, Indonesian, Polish and Vietnamese translations (from the +Translation Project). + +Update/clarify man pages. (Addresses Sourceforge Bug: #2822186) + +Fixed various Debian packaging issues --- see debian/changelog for +details. (Addresses Debian Bugs: #540111) + +Programmer's Notes +------------------ + +The configure script supports the --with-cc, --with-ccopts, and +--with-ldopts options. Instead, the more standard use of CC=, +CCFLAGS=, and LDFLAGS= in the configure command line is used instead. +Also, --with-ld, which never worked, was also removed. +(Addresses Sourceforge Bug: #2843248) + +The in-tree header files are only used if the in-tree uuid or blkid +libraries are used. Otherwise, use the system-provided uuid or blkid +header files if using the system-provided libraries. + +Fix some build failures caused by --disable-* configure options. + +Work around a bug in autoconf 2.64. + + E2fsprogs 1.41.9 (August 22, 2009) ================================== diff --git a/debian/changelog b/debian/changelog index f3317db0..f7857978 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,72 @@ +e2fsprogs (1.41.10-1) unstable; urgency=low + + * New upstream release + * Fix resize2fs bug which causes it to access invalid memory + * Add libss support for libreadline.so.6 + * Fix e2fsck's check for extent-mapped directory with an incorrect file type + * Add new e2fsck.conf configuration option: + default/broken_system_clock for system with broken CMOS hardware + clocks. (Closes: #559776) + * Fix flex_bg inode table placement algorithm used by mke2fs for + certain specific file system sizes + * Add source lintian overrids for weak-library-dev-dependency + * Fix FTBFS problem caused by texi2html changing (again) its output + location. (Closes: #552934) + * Make e2fsck to avoid rehashing directories which can fit in a + single directory block. + * Fix how e2fsck fixes sparse directories which are extent-mapped. + * Fix some big-endian bugs in e2fsck and libext2fs + * Teach e2fsck to detect and fix sparse extent-mapped directories + * Fix filefrag from core dumping on file systems with 8k block sizes + * E2fsck was depending on i_size to be correct to detect and fix + certain directory problems before actually fixing the + directory's i_size. This caused certain rare corruptions to + require two runs of e2fsck to address. + * Update Czech, Indonesian, Polish and Vietnamese translations + (from the Translation Project) + * Fix e2fsck to find and correct duplicate directory entries in + non-indexed directories. + * Add support for calling BLKDISCARD to mke2fs. + * Enhance libext2fs so it works around bug in Linux version 2.6.19 + and earlier where the /proc/swaps file was missing the header on + the first line. + * Fix resize2fs so it works correctly on file systems with external journals + * Fix libss so that it does not seg fault when using a readline + library which does not supply a readline_shutdown() function. + * Add a pre-depends for util-linux-ng (Closes: #551795) + * Update and clarify various man pages. + * Corrected dumpe2fs's usage message + * Teach libext2fs to ignore the high 32 bits of the i_blocks field + when huge_file file system feature is set, but the inode does not + have the HUGE_FILE_FL flag set. + * Change e2fsck to accept superblock times to be fudged by up to 24 + hours by default. Most distributions have fixed their init scripts, + but apparently now they have buggy virtualization scripts. :-( I + give up, too many buggy user space set ups out there. (Closes: #557636) + * Fix e2fsck to correctly print > 32-bit i_blocks numbers in problem reports + * Improve e2fsck so it prints "Illegal indirect block" instead of + "Illegal block #-1" + * Teach mke2fs to get device topology information from blkid and use + it to populate the superblock stride and stripe sizes and warn if + the block device is misaligned + * Fix a file descriptor leak in debugfs when sourcing a command file + * Fix a file descriptor leak in fsck + * Round up the bitmap size to prevent spurious segmentation faults on + BSD platforms. + * Fix resize2fs to correctly calculate the minimum size needed, when + flex_bg is enabled, to prevent resize2fs -M from failing. + * Dumpe2fs now displays more information about the contents of the journal + * Make sure the libblkid1 and libblkid1-dbg packags have changelogs + * On low memory systems, e2fsck can print some very scary looking + error messages. Clean up them up to avoid user panic. (Closes: #509529) + * Enhance blkid to support .ko.gz files in the modules.dep parser + * Fix tune2fs -j for mounted exted-enabled file systems + * Use the feature name "extent" instead of "extents" in mke2fs.conf. + Both work, but the latter is what is documented in the man page. + (Closes: #540111) + + -- Theodore Y. Ts'o Sun, 07 Feb 2010 20:56:47 -0500 + e2fsprogs (1.41.9-1) unstable; urgency=low * New upstream release diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo index 19899bcc..2a483b09 100644 --- a/doc/libext2fs.texinfo +++ b/doc/libext2fs.texinfo @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @setfilename libext2fs.info -@settitle The EXT2FS Library (version 1.41.9) +@settitle The EXT2FS Library (version 1.41.10) @synindex tp fn @comment %**end of header @@ -60,8 +60,8 @@ by the author. @title The EXT2FS Library @subtitle The EXT2FS Library -@subtitle Version 1.41.9 -@subtitle August 2009 +@subtitle Version 1.41.10 +@subtitle February 2010 @author by Theodore Ts'o @@ -102,7 +102,7 @@ by the Foundation. @top The EXT2FS Library -This manual documents the EXT2FS Library, version 1.41.9 +This manual documents the EXT2FS Library, version 1.41.10 @end ifinfo diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm index d96a89b0..1dc289ac 100644 --- a/e2fsprogs.lsm +++ b/e2fsprogs.lsm @@ -1,16 +1,16 @@ Begin3 Title: EXT2 Filesystem utilities -Version: 1.41.9 -Entered-date: 22Aug2009 +Version: 1.41.10 +Entered-date: 10Feb2010 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 - 4352kB e2fsprogs-1.41.9.tar.gz - 488kB e2fsprogs-libs-1.41.9.tar.gz - 1kB e2fsprogs-1.41.9.lsm + 4364kB e2fsprogs-1.41.10.tar.gz + 480kB e2fsprogs-libs-1.41.10.tar.gz + 1kB e2fsprogs-1.41.10.lsm Alternate-site: Platforms: linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x Copying-policy: GPL-2/LGPL-2 diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot index 25f4caba..ad0334fe 100644 --- a/po/e2fsprogs.pot +++ b/po/e2fsprogs.pot @@ -1,7 +1,8 @@ # E2fsprogs translation template file -# Copyright (C) 2009 Theodore Ts'o +# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Theodore Ts'o # This file is distributed under the same license as the e2fsprogs package. -# Theodore Ts'o , 2009. +# Theodore Ts'o , 2010. # #. The strings in e2fsck's problem.c can be very hard to translate, #. since the strings are expanded in two different ways. First of all, @@ -64,9 +65,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: e2fsprogs 1.41.8\n" +"Project-Id-Version: e2fsprogs 1.41.10\n" "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n" -"POT-Creation-Date: 2009-07-11 17:49-0400\n" +"POT-Creation-Date: 2010-02-10 15:24-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -74,7 +75,7 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: e2fsck/badblocks.c:22 misc/mke2fs.c:165 +#: e2fsck/badblocks.c:22 misc/mke2fs.c:169 #, c-format msgid "Bad block %u out of range; ignored.\n" msgstr "" @@ -88,10 +89,10 @@ msgid "while reading the bad blocks inode" msgstr "" #: e2fsck/badblocks.c:71 e2fsck/iscan.c:112 e2fsck/scantest.c:109 -#: e2fsck/unix.c:1057 e2fsck/unix.c:1140 misc/badblocks.c:1155 +#: e2fsck/unix.c:1062 e2fsck/unix.c:1145 misc/badblocks.c:1155 #: misc/badblocks.c:1163 misc/badblocks.c:1177 misc/badblocks.c:1189 -#: misc/dumpe2fs.c:510 misc/e2image.c:583 misc/e2image.c:679 -#: misc/e2image.c:695 misc/mke2fs.c:181 misc/tune2fs.c:1532 resize/main.c:310 +#: misc/dumpe2fs.c:552 misc/e2image.c:583 misc/e2image.c:679 +#: misc/e2image.c:695 misc/mke2fs.c:185 misc/tune2fs.c:1573 resize/main.c:310 #, c-format msgid "while trying to open %s" msgstr "" @@ -101,7 +102,7 @@ msgstr "" msgid "while trying popen '%s'" msgstr "" -#: e2fsck/badblocks.c:93 misc/mke2fs.c:188 +#: e2fsck/badblocks.c:93 misc/mke2fs.c:192 msgid "while reading in list of bad blocks from file" msgstr "" @@ -237,206 +238,226 @@ msgstr "" msgid "while trying to re-open %s" msgstr "" -#: e2fsck/message.c:110 +#: e2fsck/message.c:111 msgid "aextended attribute" msgstr "" -#: e2fsck/message.c:111 +#: e2fsck/message.c:112 msgid "Aerror allocating" msgstr "" -#: e2fsck/message.c:112 +#: e2fsck/message.c:113 msgid "bblock" msgstr "" -#: e2fsck/message.c:113 +#: e2fsck/message.c:114 msgid "Bbitmap" msgstr "" -#: e2fsck/message.c:114 +#: e2fsck/message.c:115 msgid "ccompress" msgstr "" -#: e2fsck/message.c:115 +#: e2fsck/message.c:116 msgid "Cconflicts with some other fs @b" msgstr "" -#: e2fsck/message.c:116 +#: e2fsck/message.c:117 msgid "iinode" msgstr "" -#: e2fsck/message.c:117 +#: e2fsck/message.c:118 msgid "Iillegal" msgstr "" -#: e2fsck/message.c:118 +#: e2fsck/message.c:119 msgid "jjournal" msgstr "" -#: e2fsck/message.c:119 +#: e2fsck/message.c:120 msgid "Ddeleted" msgstr "" -#: e2fsck/message.c:120 +#: e2fsck/message.c:121 msgid "ddirectory" msgstr "" -#: e2fsck/message.c:121 +#: e2fsck/message.c:122 msgid "eentry" msgstr "" -#: e2fsck/message.c:122 +#: e2fsck/message.c:123 msgid "E@e '%Dn' in %p (%i)" msgstr "" -#: e2fsck/message.c:123 +#: e2fsck/message.c:124 msgid "ffilesystem" msgstr "" -#: e2fsck/message.c:124 +#: e2fsck/message.c:125 msgid "Ffor @i %i (%Q) is" msgstr "" -#: e2fsck/message.c:125 +#: e2fsck/message.c:126 msgid "ggroup" msgstr "" -#: e2fsck/message.c:126 +#: e2fsck/message.c:127 msgid "hHTREE @d @i" msgstr "" -#: e2fsck/message.c:127 +#: e2fsck/message.c:128 msgid "llost+found" msgstr "" -#: e2fsck/message.c:128 +#: e2fsck/message.c:129 msgid "Lis a link" msgstr "" -#: e2fsck/message.c:129 +#: e2fsck/message.c:130 msgid "mmultiply-claimed" msgstr "" -#: e2fsck/message.c:130 +#: e2fsck/message.c:131 msgid "ninvalid" msgstr "" -#: e2fsck/message.c:131 +#: e2fsck/message.c:132 msgid "oorphaned" msgstr "" -#: e2fsck/message.c:132 +#: e2fsck/message.c:133 msgid "pproblem in" msgstr "" -#: e2fsck/message.c:133 +#: e2fsck/message.c:134 msgid "rroot @i" msgstr "" -#: e2fsck/message.c:134 +#: e2fsck/message.c:135 msgid "sshould be" msgstr "" -#: e2fsck/message.c:135 +#: e2fsck/message.c:136 msgid "Ssuper@b" msgstr "" -#: e2fsck/message.c:136 +#: e2fsck/message.c:137 msgid "uunattached" msgstr "" -#: e2fsck/message.c:137 +#: e2fsck/message.c:138 msgid "vdevice" msgstr "" -#: e2fsck/message.c:138 +#: e2fsck/message.c:139 msgid "xextent" msgstr "" -#: e2fsck/message.c:139 +#: e2fsck/message.c:140 msgid "zzero-length" msgstr "" -#: e2fsck/message.c:150 +#: e2fsck/message.c:151 msgid "" msgstr "" -#: e2fsck/message.c:151 +#: e2fsck/message.c:152 msgid "" msgstr "" -#: e2fsck/message.c:153 +#: e2fsck/message.c:154 msgid "" msgstr "" -#: e2fsck/message.c:154 +#: e2fsck/message.c:155 msgid "" msgstr "" -#: e2fsck/message.c:155 +#: e2fsck/message.c:156 msgid "" msgstr "" -#: e2fsck/message.c:156 +#: e2fsck/message.c:157 msgid "" msgstr "" -#: e2fsck/message.c:157 +#: e2fsck/message.c:158 msgid "" msgstr "" -#: e2fsck/message.c:158 +#: e2fsck/message.c:159 msgid "" msgstr "" -#: e2fsck/message.c:159 +#: e2fsck/message.c:160 msgid "" msgstr "" -#: e2fsck/message.c:160 +#: e2fsck/message.c:161 msgid "" msgstr "" -#: e2fsck/message.c:323 +#: e2fsck/message.c:330 #, c-format msgid "regular file" msgstr "" -#: e2fsck/message.c:325 +#: e2fsck/message.c:332 #, c-format msgid "directory" msgstr "" -#: e2fsck/message.c:327 +#: e2fsck/message.c:334 #, c-format msgid "character device" msgstr "" -#: e2fsck/message.c:329 +#: e2fsck/message.c:336 #, c-format msgid "block device" msgstr "" -#: e2fsck/message.c:331 +#: e2fsck/message.c:338 #, c-format msgid "named pipe" msgstr "" -#: e2fsck/message.c:333 +#: e2fsck/message.c:340 #, c-format msgid "symbolic link" msgstr "" -#: e2fsck/message.c:335 +#: e2fsck/message.c:342 #, c-format msgid "socket" msgstr "" -#: e2fsck/message.c:337 +#: e2fsck/message.c:344 #, c-format msgid "unknown file type with mode 0%o" msgstr "" +#: e2fsck/message.c:422 +msgid "indirect block" +msgstr "" + +#: e2fsck/message.c:424 +msgid "double indirect block" +msgstr "" + +#: e2fsck/message.c:426 +msgid "triple indirect block" +msgstr "" + +#: e2fsck/message.c:428 +msgid "translator block" +msgstr "" + +#: e2fsck/message.c:430 +msgid "block #" +msgstr "" + #: e2fsck/pass1b.c:220 msgid "multiply claimed inode map" msgstr "" @@ -460,85 +481,85 @@ msgstr "" msgid "internal error: couldn't lookup EA inode record for %u" msgstr "" -#: e2fsck/pass1.c:430 e2fsck/pass2.c:782 +#: e2fsck/pass1.c:475 e2fsck/pass2.c:776 msgid "reading directory block" msgstr "" -#: e2fsck/pass1.c:552 +#: e2fsck/pass1.c:597 msgid "in-use inode map" msgstr "" -#: e2fsck/pass1.c:561 +#: e2fsck/pass1.c:606 msgid "directory inode map" msgstr "" -#: e2fsck/pass1.c:569 +#: e2fsck/pass1.c:614 msgid "regular file inode map" msgstr "" -#: e2fsck/pass1.c:576 +#: e2fsck/pass1.c:621 msgid "in-use block map" msgstr "" -#: e2fsck/pass1.c:630 +#: e2fsck/pass1.c:675 msgid "opening inode scan" msgstr "" -#: e2fsck/pass1.c:654 +#: e2fsck/pass1.c:699 msgid "getting next inode from scan" msgstr "" -#: e2fsck/pass1.c:1123 +#: e2fsck/pass1.c:1169 msgid "Pass 1" msgstr "" -#: e2fsck/pass1.c:1180 +#: e2fsck/pass1.c:1226 #, c-format msgid "reading indirect blocks of inode %u" msgstr "" -#: e2fsck/pass1.c:1224 +#: e2fsck/pass1.c:1270 msgid "bad inode map" msgstr "" -#: e2fsck/pass1.c:1246 +#: e2fsck/pass1.c:1292 msgid "inode in bad block map" msgstr "" -#: e2fsck/pass1.c:1266 +#: e2fsck/pass1.c:1312 msgid "imagic inode map" msgstr "" -#: e2fsck/pass1.c:1293 +#: e2fsck/pass1.c:1339 msgid "multiply claimed block map" msgstr "" -#: e2fsck/pass1.c:1392 +#: e2fsck/pass1.c:1438 msgid "ext attr block map" msgstr "" -#: e2fsck/pass1.c:2134 +#: e2fsck/pass1.c:2162 #, c-format msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n" msgstr "" -#: e2fsck/pass1.c:2449 +#: e2fsck/pass1.c:2514 msgid "block bitmap" msgstr "" -#: e2fsck/pass1.c:2453 +#: e2fsck/pass1.c:2518 msgid "inode bitmap" msgstr "" -#: e2fsck/pass1.c:2457 +#: e2fsck/pass1.c:2522 msgid "inode table" msgstr "" -#: e2fsck/pass2.c:283 +#: e2fsck/pass2.c:277 msgid "Pass 2" msgstr "" -#: e2fsck/pass2.c:805 +#: e2fsck/pass2.c:799 msgid "Can not continue." msgstr "" @@ -896,7 +917,7 @@ msgstr "" msgid "Clear @j" msgstr "" -#: e2fsck/problem.c:245 e2fsck/problem.c:647 +#: e2fsck/problem.c:245 e2fsck/problem.c:664 #. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem. msgid "@f has feature flag(s) set, but is a revision 0 @f. " msgstr "" @@ -907,13 +928,13 @@ msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n" msgstr "" #: e2fsck/problem.c:255 -#. @-expanded: illegal block #%B (%b) found in orphaned inode %i.\n -msgid "@I @b #%B (%b) found in @o @i %i.\n" +#. @-expanded: illegal %B (%b) found in orphaned inode %i.\n +msgid "@I %B (%b) found in @o @i %i.\n" msgstr "" #: e2fsck/problem.c:260 -#. @-expanded: Already cleared block #%B (%b) found in orphaned inode %i.\n -msgid "Already cleared @b #%B (%b) found in @o @i %i.\n" +#. @-expanded: Already cleared %B (%b) found in orphaned inode %i.\n +msgid "Already cleared %B (%b) found in @o @i %i.\n" msgstr "" #: e2fsck/problem.c:265 @@ -1008,13 +1029,19 @@ msgid "Resize @i not valid. " msgstr "" #: e2fsck/problem.c:337 -#. @-expanded: superblock last mount time is in the future. -msgid "@S last mount time is in the future. " +#. @-expanded: superblock last mount time (%t,\n +#. @-expanded: \tnow = %T) is in the future.\n +msgid "" +"@S last mount time (%t,\n" +"\tnow = %T) is in the future.\n" msgstr "" #: e2fsck/problem.c:342 -#. @-expanded: superblock last write time is in the future. -msgid "@S last write time is in the future. " +#. @-expanded: superblock last write time (%t,\n +#. @-expanded: \tnow = %T) is in the future.\n +msgid "" +"@S last write time (%t,\n" +"\tnow = %T) is in the future.\n" msgstr "" #: e2fsck/problem.c:346 @@ -1068,122 +1095,147 @@ msgstr "" msgid "The test_fs flag is set (and ext4 is available). " msgstr "" -#: e2fsck/problem.c:392 +#: e2fsck/problem.c:390 +#. @-expanded: superblock last mount time is in the future.\n +#. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly +#. @-expanded: set) +msgid "" +"@S last mount time is in the future.\n" +"\t(by less than a day, probably due to the hardware clock being incorrectly " +"set) " +msgstr "" + +#: e2fsck/problem.c:396 +#. @-expanded: superblock last write time is in the future.\n +#. @-expanded: \t(by less than a day, probably due to the hardware clock being incorrectly +#. @-expanded: set). +msgid "" +"@S last write time is in the future.\n" +"\t(by less than a day, probably due to the hardware clock being incorrectly " +"set). " +msgstr "" + +#: e2fsck/problem.c:402 +#. @-expanded: One or more block group descriptor checksums are invalid. +msgid "One or more @b @g descriptor checksums are invalid. " +msgstr "" + +#: e2fsck/problem.c:409 #. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n msgid "Pass 1: Checking @is, @bs, and sizes\n" msgstr "" -#: e2fsck/problem.c:396 +#: e2fsck/problem.c:413 #. @-expanded: root inode is not a directory. msgid "@r is not a @d. " msgstr "" -#: e2fsck/problem.c:401 +#: e2fsck/problem.c:418 #. @-expanded: root inode has dtime set (probably due to old mke2fs). msgid "@r has dtime set (probably due to old mke2fs). " msgstr "" -#: e2fsck/problem.c:406 +#: e2fsck/problem.c:423 #. @-expanded: Reserved inode %i (%Q) has invalid mode. msgid "Reserved @i %i (%Q) has @n mode. " msgstr "" -#: e2fsck/problem.c:411 +#: e2fsck/problem.c:428 #, c-format #. @-expanded: deleted inode %i has zero dtime. msgid "@D @i %i has zero dtime. " msgstr "" -#: e2fsck/problem.c:416 +#: e2fsck/problem.c:433 #, c-format #. @-expanded: inode %i is in use, but has dtime set. msgid "@i %i is in use, but has dtime set. " msgstr "" -#: e2fsck/problem.c:421 +#: e2fsck/problem.c:438 #, c-format #. @-expanded: inode %i is a zero-length directory. msgid "@i %i is a @z @d. " msgstr "" -#: e2fsck/problem.c:426 +#: e2fsck/problem.c:443 #. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n msgid "@g %g's @b @B at %b @C.\n" msgstr "" -#: e2fsck/problem.c:431 +#: e2fsck/problem.c:448 #. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n msgid "@g %g's @i @B at %b @C.\n" msgstr "" -#: e2fsck/problem.c:436 +#: e2fsck/problem.c:453 #. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n msgid "@g %g's @i table at %b @C.\n" msgstr "" -#: e2fsck/problem.c:441 +#: e2fsck/problem.c:458 #. @-expanded: group %g's block bitmap (%b) is bad. msgid "@g %g's @b @B (%b) is bad. " msgstr "" -#: e2fsck/problem.c:446 +#: e2fsck/problem.c:463 #. @-expanded: group %g's inode bitmap (%b) is bad. msgid "@g %g's @i @B (%b) is bad. " msgstr "" -#: e2fsck/problem.c:451 +#: e2fsck/problem.c:468 #. @-expanded: inode %i, i_size is %Is, should be %N. msgid "@i %i, i_size is %Is, @s %N. " msgstr "" -#: e2fsck/problem.c:456 +#: e2fsck/problem.c:473 #. @-expanded: inode %i, i_blocks is %Ib, should be %N. msgid "@i %i, i_@bs is %Ib, @s %N. " msgstr "" -#: e2fsck/problem.c:461 -#. @-expanded: illegal block #%B (%b) in inode %i. -msgid "@I @b #%B (%b) in @i %i. " +#: e2fsck/problem.c:478 +#. @-expanded: illegal %B (%b) in inode %i. +msgid "@I %B (%b) in @i %i. " msgstr "" -#: e2fsck/problem.c:466 -#. @-expanded: block #%B (%b) overlaps filesystem metadata in inode %i. -msgid "@b #%B (%b) overlaps @f metadata in @i %i. " +#: e2fsck/problem.c:483 +#. @-expanded: %B (%b) overlaps filesystem metadata in inode %i. +msgid "%B (%b) overlaps @f metadata in @i %i. " msgstr "" -#: e2fsck/problem.c:471 +#: e2fsck/problem.c:488 #, c-format #. @-expanded: inode %i has illegal block(s). msgid "@i %i has illegal @b(s). " msgstr "" -#: e2fsck/problem.c:476 +#: e2fsck/problem.c:493 #, c-format #. @-expanded: Too many illegal blocks in inode %i.\n msgid "Too many illegal @bs in @i %i.\n" msgstr "" -#: e2fsck/problem.c:481 -#. @-expanded: illegal block #%B (%b) in bad block inode. -msgid "@I @b #%B (%b) in bad @b @i. " +#: e2fsck/problem.c:498 +#. @-expanded: illegal %B (%b) in bad block inode. +msgid "@I %B (%b) in bad @b @i. " msgstr "" -#: e2fsck/problem.c:486 +#: e2fsck/problem.c:503 #. @-expanded: Bad block inode has illegal block(s). msgid "Bad @b @i has illegal @b(s). " msgstr "" -#: e2fsck/problem.c:491 +#: e2fsck/problem.c:508 #. @-expanded: Duplicate or bad block in use!\n msgid "Duplicate or bad @b in use!\n" msgstr "" -#: e2fsck/problem.c:496 +#: e2fsck/problem.c:513 #. @-expanded: Bad block %b used as bad block inode indirect block. msgid "Bad @b %b used as bad @b @i indirect @b. " msgstr "" -#: e2fsck/problem.c:501 +#: e2fsck/problem.c:518 #. @-expanded: \n #. @-expanded: The bad block inode has probably been corrupted. You probably\n #. @-expanded: should stop now and run e2fsck -c to scan for bad blocks\n @@ -1195,7 +1247,7 @@ msgid "" "in the @f.\n" msgstr "" -#: e2fsck/problem.c:508 +#: e2fsck/problem.c:525 #. @-expanded: \n #. @-expanded: If the block is really bad, the filesystem can not be fixed.\n msgid "" @@ -1203,7 +1255,7 @@ msgid "" "If the @b is really bad, the @f can not be fixed.\n" msgstr "" -#: e2fsck/problem.c:513 +#: e2fsck/problem.c:530 #. @-expanded: You can remove this block from the bad block list and hope\n #. @-expanded: that the block is really OK. But there are no guarantees.\n #. @-expanded: \n @@ -1213,120 +1265,120 @@ msgid "" "\n" msgstr "" -#: e2fsck/problem.c:519 +#: e2fsck/problem.c:536 #. @-expanded: The primary superblock (%b) is on the bad block list.\n msgid "The primary @S (%b) is on the bad @b list.\n" msgstr "" -#: e2fsck/problem.c:524 +#: e2fsck/problem.c:541 #. @-expanded: Block %b in the primary group descriptors is on the bad block list\n msgid "Block %b in the primary @g descriptors is on the bad @b list\n" msgstr "" -#: e2fsck/problem.c:530 +#: e2fsck/problem.c:547 #. @-expanded: Warning: Group %g's superblock (%b) is bad.\n msgid "Warning: Group %g's @S (%b) is bad.\n" msgstr "" -#: e2fsck/problem.c:535 +#: e2fsck/problem.c:552 #. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n" msgstr "" -#: e2fsck/problem.c:541 +#: e2fsck/problem.c:558 #. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n" msgstr "" -#: e2fsck/problem.c:547 +#: e2fsck/problem.c:564 #. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n" msgstr "" -#: e2fsck/problem.c:552 +#: e2fsck/problem.c:569 #, c-format #. @-expanded: error allocating block buffer for relocating %s\n msgid "@A @b buffer for relocating %s\n" msgstr "" -#: e2fsck/problem.c:557 +#: e2fsck/problem.c:574 #. @-expanded: Relocating group %g's %s from %b to %c...\n msgid "Relocating @g %g's %s from %b to %c...\n" msgstr "" -#: e2fsck/problem.c:562 +#: e2fsck/problem.c:579 #, c-format #. @-expanded: Relocating group %g's %s to %c...\n msgid "Relocating @g %g's %s to %c...\n" msgstr "" -#: e2fsck/problem.c:567 +#: e2fsck/problem.c:584 #. @-expanded: Warning: could not read block %b of %s: %m\n msgid "Warning: could not read @b %b of %s: %m\n" msgstr "" -#: e2fsck/problem.c:572 +#: e2fsck/problem.c:589 #. @-expanded: Warning: could not write block %b for %s: %m\n msgid "Warning: could not write @b %b for %s: %m\n" msgstr "" -#: e2fsck/problem.c:577 e2fsck/problem.c:1383 +#: e2fsck/problem.c:594 e2fsck/problem.c:1400 #. @-expanded: error allocating inode bitmap (%N): %m\n msgid "@A @i @B (%N): %m\n" msgstr "" -#: e2fsck/problem.c:582 +#: e2fsck/problem.c:599 #. @-expanded: error allocating block bitmap (%N): %m\n msgid "@A @b @B (%N): %m\n" msgstr "" -#: e2fsck/problem.c:587 +#: e2fsck/problem.c:604 #, c-format #. @-expanded: error allocating icount link information: %m\n msgid "@A icount link information: %m\n" msgstr "" -#: e2fsck/problem.c:592 +#: e2fsck/problem.c:609 #, c-format #. @-expanded: error allocating directory block array: %m\n msgid "@A @d @b array: %m\n" msgstr "" -#: e2fsck/problem.c:597 +#: e2fsck/problem.c:614 #, c-format #. @-expanded: Error while scanning inodes (%i): %m\n msgid "Error while scanning @is (%i): %m\n" msgstr "" -#: e2fsck/problem.c:602 +#: e2fsck/problem.c:619 #, c-format #. @-expanded: Error while iterating over blocks in inode %i: %m\n msgid "Error while iterating over @bs in @i %i: %m\n" msgstr "" -#: e2fsck/problem.c:607 +#: e2fsck/problem.c:624 #. @-expanded: Error storing inode count information (inode=%i, count=%N): %m\n msgid "Error storing @i count information (@i=%i, count=%N): %m\n" msgstr "" -#: e2fsck/problem.c:612 +#: e2fsck/problem.c:629 #. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n" msgstr "" -#: e2fsck/problem.c:618 +#: e2fsck/problem.c:635 #, c-format #. @-expanded: Error reading inode %i: %m\n msgid "Error reading @i %i: %m\n" msgstr "" -#: e2fsck/problem.c:626 +#: e2fsck/problem.c:643 #, c-format #. @-expanded: inode %i has imagic flag set. msgid "@i %i has imagic flag set. " msgstr "" -#: e2fsck/problem.c:631 +#: e2fsck/problem.c:648 #, c-format #. @-expanded: Special (device/socket/fifo/symlink) file (inode %i) has immutable\n #. @-expanded: or append-only flag set. @@ -1335,150 +1387,148 @@ msgid "" "or append-only flag set. " msgstr "" -#: e2fsck/problem.c:637 +#: e2fsck/problem.c:654 #, c-format #. @-expanded: inode %i has compression flag set on filesystem without compression support. msgid "@i %i has @cion flag set on @f without @cion support. " msgstr "" -#: e2fsck/problem.c:642 +#: e2fsck/problem.c:659 #, c-format #. @-expanded: Special (device/socket/fifo) inode %i has non-zero size. msgid "Special (@v/socket/fifo) @i %i has non-zero size. " msgstr "" -#: e2fsck/problem.c:652 +#: e2fsck/problem.c:669 #. @-expanded: journal inode is not in use, but contains data. msgid "@j @i is not in use, but contains data. " msgstr "" -#: e2fsck/problem.c:657 +#: e2fsck/problem.c:674 #. @-expanded: journal is not regular file. msgid "@j is not regular file. " msgstr "" -#: e2fsck/problem.c:662 +#: e2fsck/problem.c:679 #, c-format #. @-expanded: inode %i was part of the orphaned inode list. msgid "@i %i was part of the @o @i list. " msgstr "" -#: e2fsck/problem.c:668 +#: e2fsck/problem.c:685 #. @-expanded: inodes that were part of a corrupted orphan linked list found. msgid "@is that were part of a corrupted orphan linked list found. " msgstr "" -#: e2fsck/problem.c:673 +#: e2fsck/problem.c:690 #. @-expanded: error allocating refcount structure (%N): %m\n msgid "@A refcount structure (%N): %m\n" msgstr "" -#: e2fsck/problem.c:678 +#: e2fsck/problem.c:695 #. @-expanded: Error reading extended attribute block %b for inode %i. msgid "Error reading @a @b %b for @i %i. " msgstr "" -#: e2fsck/problem.c:683 +#: e2fsck/problem.c:700 #. @-expanded: inode %i has a bad extended attribute block %b. msgid "@i %i has a bad @a @b %b. " msgstr "" -#: e2fsck/problem.c:688 +#: e2fsck/problem.c:705 #. @-expanded: Error reading extended attribute block %b (%m). msgid "Error reading @a @b %b (%m). " msgstr "" -#: e2fsck/problem.c:693 -#. @-expanded: extended attribute block %b has reference count %B, should be %N. -msgid "@a @b %b has reference count %B, @s %N. " +#: e2fsck/problem.c:710 +#. @-expanded: extended attribute block %b has reference count %r, should be %N. +msgid "@a @b %b has reference count %r, @s %N. " msgstr "" -#: e2fsck/problem.c:698 +#: e2fsck/problem.c:715 #. @-expanded: Error writing extended attribute block %b (%m). msgid "Error writing @a @b %b (%m). " msgstr "" -#: e2fsck/problem.c:703 +#: e2fsck/problem.c:720 #. @-expanded: extended attribute block %b has h_blocks > 1. msgid "@a @b %b has h_@bs > 1. " msgstr "" -#: e2fsck/problem.c:708 +#: e2fsck/problem.c:725 #. @-expanded: error allocating extended attribute block %b. msgid "@A @a @b %b. " msgstr "" -#: e2fsck/problem.c:713 +#: e2fsck/problem.c:730 #. @-expanded: extended attribute block %b is corrupt (allocation collision). msgid "@a @b %b is corrupt (allocation collision). " msgstr "" -#: e2fsck/problem.c:718 +#: e2fsck/problem.c:735 #. @-expanded: extended attribute block %b is corrupt (invalid name). msgid "@a @b %b is corrupt (@n name). " msgstr "" -#: e2fsck/problem.c:723 +#: e2fsck/problem.c:740 #. @-expanded: extended attribute block %b is corrupt (invalid value). msgid "@a @b %b is corrupt (@n value). " msgstr "" -#: e2fsck/problem.c:728 +#: e2fsck/problem.c:745 #, c-format #. @-expanded: inode %i is too big. msgid "@i %i is too big. " msgstr "" -#: e2fsck/problem.c:732 -#. @-expanded: block #%B (%b) causes directory to be too big. -msgid "@b #%B (%b) causes @d to be too big. " +#: e2fsck/problem.c:749 +#. @-expanded: %B (%b) causes directory to be too big. +msgid "%B (%b) causes @d to be too big. " msgstr "" -#: e2fsck/problem.c:737 -#. @-expanded: block #%B (%b) causes file to be too big. -msgid "@b #%B (%b) causes file to be too big. " +#: e2fsck/problem.c:754 +msgid "%B (%b) causes file to be too big. " msgstr "" -#: e2fsck/problem.c:742 -#. @-expanded: block #%B (%b) causes symlink to be too big. -msgid "@b #%B (%b) causes symlink to be too big. " +#: e2fsck/problem.c:759 +msgid "%B (%b) causes symlink to be too big. " msgstr "" -#: e2fsck/problem.c:747 +#: e2fsck/problem.c:764 #, c-format #. @-expanded: inode %i has INDEX_FL flag set on filesystem without htree support.\n msgid "@i %i has INDEX_FL flag set on @f without htree support.\n" msgstr "" -#: e2fsck/problem.c:752 +#: e2fsck/problem.c:769 #, c-format #. @-expanded: inode %i has INDEX_FL flag set but is not a directory.\n msgid "@i %i has INDEX_FL flag set but is not a @d.\n" msgstr "" -#: e2fsck/problem.c:757 +#: e2fsck/problem.c:774 #, c-format #. @-expanded: HTREE directory inode %i has an invalid root node.\n msgid "@h %i has an @n root node.\n" msgstr "" -#: e2fsck/problem.c:762 +#: e2fsck/problem.c:779 #. @-expanded: HTREE directory inode %i has an unsupported hash version (%N)\n msgid "@h %i has an unsupported hash version (%N)\n" msgstr "" -#: e2fsck/problem.c:767 +#: e2fsck/problem.c:784 #, c-format #. @-expanded: HTREE directory inode %i uses an incompatible htree root node flag.\n msgid "@h %i uses an incompatible htree root node flag.\n" msgstr "" -#: e2fsck/problem.c:772 +#: e2fsck/problem.c:789 #. @-expanded: HTREE directory inode %i has a tree depth (%N) which is too big\n msgid "@h %i has a tree depth (%N) which is too big\n" msgstr "" -#: e2fsck/problem.c:777 +#: e2fsck/problem.c:794 #. @-expanded: Bad block inode has an indirect block (%b) that conflicts with\n #. @-expanded: filesystem metadata. msgid "" @@ -1486,54 +1536,54 @@ msgid "" "@f metadata. " msgstr "" -#: e2fsck/problem.c:783 +#: e2fsck/problem.c:800 #, c-format #. @-expanded: Resize inode (re)creation failed: %m. msgid "Resize @i (re)creation failed: %m." msgstr "" -#: e2fsck/problem.c:788 +#: e2fsck/problem.c:805 #. @-expanded: inode %i has a extra size (%IS) which is invalid\n msgid "@i %i has a extra size (%IS) which is @n\n" msgstr "" -#: e2fsck/problem.c:793 +#: e2fsck/problem.c:810 #. @-expanded: extended attribute in inode %i has a namelen (%N) which is invalid\n msgid "@a in @i %i has a namelen (%N) which is @n\n" msgstr "" -#: e2fsck/problem.c:798 +#: e2fsck/problem.c:815 #. @-expanded: extended attribute in inode %i has a value offset (%N) which is invalid\n msgid "@a in @i %i has a value offset (%N) which is @n\n" msgstr "" -#: e2fsck/problem.c:803 +#: e2fsck/problem.c:820 #. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n" msgstr "" -#: e2fsck/problem.c:808 +#: e2fsck/problem.c:825 #. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n msgid "@a in @i %i has a value size (%N) which is @n\n" msgstr "" -#: e2fsck/problem.c:813 +#: e2fsck/problem.c:830 #. @-expanded: extended attribute in inode %i has a hash (%N) which is invalid\n msgid "@a in @i %i has a hash (%N) which is @n\n" msgstr "" -#: e2fsck/problem.c:818 +#: e2fsck/problem.c:835 #. @-expanded: inode %i is a %It but it looks like it is really a directory.\n msgid "@i %i is a %It but it looks like it is really a directory.\n" msgstr "" -#: e2fsck/problem.c:823 +#: e2fsck/problem.c:840 #, c-format #. @-expanded: Error while reading over extent tree in inode %i: %m\n msgid "Error while reading over @x tree in @i %i: %m\n" msgstr "" -#: e2fsck/problem.c:828 +#: e2fsck/problem.c:845 #. @-expanded: Failed to iterate extents in inode %i\n #. @-expanded: \t(op %s, blk %b, lblk %c): %m\n msgid "" @@ -1541,7 +1591,7 @@ msgid "" "\t(op %s, blk %b, lblk %c): %m\n" msgstr "" -#: e2fsck/problem.c:834 +#: e2fsck/problem.c:851 #. @-expanded: inode %i has an invalid extent\n #. @-expanded: \t(logical block %c, invalid physical block %b, len %N)\n msgid "" @@ -1549,7 +1599,7 @@ msgid "" "\t(logical @b %c, @n physical @b %b, len %N)\n" msgstr "" -#: e2fsck/problem.c:839 +#: e2fsck/problem.c:856 #. @-expanded: inode %i has an invalid extent\n #. @-expanded: \t(logical block %c, physical block %b, invalid len %N)\n msgid "" @@ -1557,30 +1607,30 @@ msgid "" "\t(logical @b %c, physical @b %b, @n len %N)\n" msgstr "" -#: e2fsck/problem.c:844 +#: e2fsck/problem.c:861 #, c-format #. @-expanded: inode %i has EXTENTS_FL flag set on filesystem without extents support.\n msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n" msgstr "" -#: e2fsck/problem.c:849 +#: e2fsck/problem.c:866 #, c-format #. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n" msgstr "" -#: e2fsck/problem.c:854 +#: e2fsck/problem.c:871 #, c-format #. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n msgid "@i %i missing EXTENT_FL, but is in extents format\n" msgstr "" -#: e2fsck/problem.c:859 +#: e2fsck/problem.c:876 #, c-format msgid "Fast symlink %i has EXTENT_FL set. " msgstr "" -#: e2fsck/problem.c:864 +#: e2fsck/problem.c:881 #. @-expanded: inode %i has out of order extents\n #. @-expanded: \t(invalid logical block %c, physical block %b, len %N)\n msgid "" @@ -1588,12 +1638,12 @@ msgid "" "\t(@n logical @b %c, physical @b %b, len %N)\n" msgstr "" -#: e2fsck/problem.c:868 +#: e2fsck/problem.c:885 #. @-expanded: inode %i has an invalid extent node (blk %b, lblk %c)\n msgid "@i %i has an invalid extent node (blk %b, lblk %c)\n" msgstr "" -#: e2fsck/problem.c:875 +#: e2fsck/problem.c:892 #. @-expanded: \n #. @-expanded: Running additional passes to resolve blocks claimed by more than one inode...\n #. @-expanded: Pass 1B: Rescanning for multiply-claimed blocks\n @@ -1603,63 +1653,63 @@ msgid "" "Pass 1B: Rescanning for @m @bs\n" msgstr "" -#: e2fsck/problem.c:881 +#: e2fsck/problem.c:898 #, c-format #. @-expanded: multiply-claimed block(s) in inode %i: msgid "@m @b(s) in @i %i:" msgstr "" -#: e2fsck/problem.c:896 +#: e2fsck/problem.c:913 #, c-format msgid "Error while scanning inodes (%i): %m\n" msgstr "" -#: e2fsck/problem.c:901 +#: e2fsck/problem.c:918 #, c-format #. @-expanded: error allocating inode bitmap (inode_dup_map): %m\n msgid "@A @i @B (@i_dup_map): %m\n" msgstr "" -#: e2fsck/problem.c:906 +#: e2fsck/problem.c:923 #, c-format #. @-expanded: Error while iterating over blocks in inode %i (%s): %m\n msgid "Error while iterating over @bs in @i %i (%s): %m\n" msgstr "" -#: e2fsck/problem.c:911 e2fsck/problem.c:1227 +#: e2fsck/problem.c:928 e2fsck/problem.c:1244 #. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n" msgstr "" -#: e2fsck/problem.c:917 +#: e2fsck/problem.c:934 #. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n msgid "Pass 1C: Scanning directories for @is with @m @bs\n" msgstr "" -#: e2fsck/problem.c:923 +#: e2fsck/problem.c:940 #. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n msgid "Pass 1D: Reconciling @m @bs\n" msgstr "" -#: e2fsck/problem.c:928 +#: e2fsck/problem.c:945 #. @-expanded: File %Q (inode #%i, mod time %IM) \n -#. @-expanded: has %B multiply-claimed block(s), shared with %N file(s):\n +#. @-expanded: has %r multiply-claimed block(s), shared with %N file(s):\n msgid "" "File %Q (@i #%i, mod time %IM) \n" -" has %B @m @b(s), shared with %N file(s):\n" +" has %r @m @b(s), shared with %N file(s):\n" msgstr "" -#: e2fsck/problem.c:934 +#: e2fsck/problem.c:951 #. @-expanded: \t%Q (inode #%i, mod time %IM)\n msgid "\t%Q (@i #%i, mod time %IM)\n" msgstr "" -#: e2fsck/problem.c:939 +#: e2fsck/problem.c:956 #. @-expanded: \t\n msgid "\t<@f metadata>\n" msgstr "" -#: e2fsck/problem.c:944 +#: e2fsck/problem.c:961 #. @-expanded: (There are %N inodes containing multiply-claimed blocks.)\n #. @-expanded: \n msgid "" @@ -1667,7 +1717,7 @@ msgid "" "\n" msgstr "" -#: e2fsck/problem.c:949 +#: e2fsck/problem.c:966 #. @-expanded: multiply-claimed blocks already reassigned or cloned.\n #. @-expanded: \n msgid "" @@ -1675,313 +1725,313 @@ msgid "" "\n" msgstr "" -#: e2fsck/problem.c:962 +#: e2fsck/problem.c:979 #, c-format msgid "Couldn't clone file: %m\n" msgstr "" -#: e2fsck/problem.c:968 +#: e2fsck/problem.c:985 #. @-expanded: Pass 2: Checking directory structure\n msgid "Pass 2: Checking @d structure\n" msgstr "" -#: e2fsck/problem.c:973 +#: e2fsck/problem.c:990 #, c-format #. @-expanded: invalid inode number for '.' in directory inode %i.\n msgid "@n @i number for '.' in @d @i %i.\n" msgstr "" -#: e2fsck/problem.c:978 +#: e2fsck/problem.c:995 #. @-expanded: entry '%Dn' in %p (%i) has invalid inode #: %Di.\n msgid "@E has @n @i #: %Di.\n" msgstr "" -#: e2fsck/problem.c:983 +#: e2fsck/problem.c:1000 #. @-expanded: entry '%Dn' in %p (%i) has deleted/unused inode %Di. msgid "@E has @D/unused @i %Di. " msgstr "" -#: e2fsck/problem.c:988 +#: e2fsck/problem.c:1005 #. @-expanded: entry '%Dn' in %p (%i) is a link to '.' msgid "@E @L to '.' " msgstr "" -#: e2fsck/problem.c:993 +#: e2fsck/problem.c:1010 #. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n msgid "@E points to @i (%Di) located in a bad @b.\n" msgstr "" -#: e2fsck/problem.c:998 +#: e2fsck/problem.c:1015 #. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n msgid "@E @L to @d %P (%Di).\n" msgstr "" -#: e2fsck/problem.c:1003 +#: e2fsck/problem.c:1020 #. @-expanded: entry '%Dn' in %p (%i) is a link to the root inode.\n msgid "@E @L to the @r.\n" msgstr "" -#: e2fsck/problem.c:1008 +#: e2fsck/problem.c:1025 #. @-expanded: entry '%Dn' in %p (%i) has illegal characters in its name.\n msgid "@E has illegal characters in its name.\n" msgstr "" -#: e2fsck/problem.c:1013 +#: e2fsck/problem.c:1030 #, c-format #. @-expanded: Missing '.' in directory inode %i.\n msgid "Missing '.' in @d @i %i.\n" msgstr "" -#: e2fsck/problem.c:1018 +#: e2fsck/problem.c:1035 #, c-format #. @-expanded: Missing '..' in directory inode %i.\n msgid "Missing '..' in @d @i %i.\n" msgstr "" -#: e2fsck/problem.c:1023 +#: e2fsck/problem.c:1040 #. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n" msgstr "" -#: e2fsck/problem.c:1028 +#: e2fsck/problem.c:1045 #. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n msgid "Second @e '%Dn' (@i=%Di) in @d @i %i @s '..'\n" msgstr "" -#: e2fsck/problem.c:1033 +#: e2fsck/problem.c:1050 #. @-expanded: i_faddr for inode %i (%Q) is %IF, should be zero.\n msgid "i_faddr @F %IF, @s zero.\n" msgstr "" -#: e2fsck/problem.c:1038 +#: e2fsck/problem.c:1055 #. @-expanded: i_file_acl for inode %i (%Q) is %If, should be zero.\n msgid "i_file_acl @F %If, @s zero.\n" msgstr "" -#: e2fsck/problem.c:1043 +#: e2fsck/problem.c:1060 #. @-expanded: i_dir_acl for inode %i (%Q) is %Id, should be zero.\n msgid "i_dir_acl @F %Id, @s zero.\n" msgstr "" -#: e2fsck/problem.c:1048 +#: e2fsck/problem.c:1065 #. @-expanded: i_frag for inode %i (%Q) is %N, should be zero.\n msgid "i_frag @F %N, @s zero.\n" msgstr "" -#: e2fsck/problem.c:1053 +#: e2fsck/problem.c:1070 #. @-expanded: i_fsize for inode %i (%Q) is %N, should be zero.\n msgid "i_fsize @F %N, @s zero.\n" msgstr "" -#: e2fsck/problem.c:1058 +#: e2fsck/problem.c:1075 #. @-expanded: inode %i (%Q) has invalid mode (%Im).\n msgid "@i %i (%Q) has @n mode (%Im).\n" msgstr "" -#: e2fsck/problem.c:1063 -#. @-expanded: directory inode %i, block %B, offset %N: directory corrupted\n -msgid "@d @i %i, @b %B, offset %N: @d corrupted\n" +#: e2fsck/problem.c:1080 +#. @-expanded: directory inode %i, %B, offset %N: directory corrupted\n +msgid "@d @i %i, %B, offset %N: @d corrupted\n" msgstr "" -#: e2fsck/problem.c:1068 -#. @-expanded: directory inode %i, block %B, offset %N: filename too long\n -msgid "@d @i %i, @b %B, offset %N: filename too long\n" +#: e2fsck/problem.c:1085 +#. @-expanded: directory inode %i, %B, offset %N: filename too long\n +msgid "@d @i %i, %B, offset %N: filename too long\n" msgstr "" -#: e2fsck/problem.c:1073 -#. @-expanded: directory inode %i has an unallocated block #%B. -msgid "@d @i %i has an unallocated @b #%B. " +#: e2fsck/problem.c:1090 +#. @-expanded: directory inode %i has an unallocated %B. +msgid "@d @i %i has an unallocated %B. " msgstr "" -#: e2fsck/problem.c:1078 +#: e2fsck/problem.c:1095 #, c-format #. @-expanded: '.' directory entry in directory inode %i is not NULL terminated\n msgid "'.' @d @e in @d @i %i is not NULL terminated\n" msgstr "" -#: e2fsck/problem.c:1083 +#: e2fsck/problem.c:1100 #, c-format #. @-expanded: '..' directory entry in directory inode %i is not NULL terminated\n msgid "'..' @d @e in @d @i %i is not NULL terminated\n" msgstr "" -#: e2fsck/problem.c:1088 +#: e2fsck/problem.c:1105 #. @-expanded: inode %i (%Q) is an illegal character device.\n msgid "@i %i (%Q) is an @I character @v.\n" msgstr "" -#: e2fsck/problem.c:1093 +#: e2fsck/problem.c:1110 #. @-expanded: inode %i (%Q) is an illegal block device.\n msgid "@i %i (%Q) is an @I @b @v.\n" msgstr "" -#: e2fsck/problem.c:1098 +#: e2fsck/problem.c:1115 #. @-expanded: entry '%Dn' in %p (%i) is duplicate '.' entry.\n msgid "@E is duplicate '.' @e.\n" msgstr "" -#: e2fsck/problem.c:1103 +#: e2fsck/problem.c:1120 #. @-expanded: entry '%Dn' in %p (%i) is duplicate '..' entry.\n msgid "@E is duplicate '..' @e.\n" msgstr "" -#: e2fsck/problem.c:1108 e2fsck/problem.c:1408 +#: e2fsck/problem.c:1125 e2fsck/problem.c:1425 #, c-format msgid "Internal error: couldn't find dir_info for %i.\n" msgstr "" -#: e2fsck/problem.c:1113 +#: e2fsck/problem.c:1130 #. @-expanded: entry '%Dn' in %p (%i) has rec_len of %Dr, should be %N.\n msgid "@E has rec_len of %Dr, @s %N.\n" msgstr "" -#: e2fsck/problem.c:1118 +#: e2fsck/problem.c:1135 #, c-format #. @-expanded: error allocating icount structure: %m\n msgid "@A icount structure: %m\n" msgstr "" -#: e2fsck/problem.c:1123 +#: e2fsck/problem.c:1140 #, c-format #. @-expanded: Error iterating over directory blocks: %m\n msgid "Error iterating over @d @bs: %m\n" msgstr "" -#: e2fsck/problem.c:1128 +#: e2fsck/problem.c:1145 #. @-expanded: Error reading directory block %b (inode %i): %m\n msgid "Error reading @d @b %b (@i %i): %m\n" msgstr "" -#: e2fsck/problem.c:1133 +#: e2fsck/problem.c:1150 #. @-expanded: Error writing directory block %b (inode %i): %m\n msgid "Error writing @d @b %b (@i %i): %m\n" msgstr "" -#: e2fsck/problem.c:1138 +#: e2fsck/problem.c:1155 #, c-format #. @-expanded: error allocating new directory block for inode %i (%s): %m\n msgid "@A new @d @b for @i %i (%s): %m\n" msgstr "" -#: e2fsck/problem.c:1143 +#: e2fsck/problem.c:1160 #, c-format #. @-expanded: Error deallocating inode %i: %m\n msgid "Error deallocating @i %i: %m\n" msgstr "" -#: e2fsck/problem.c:1148 +#: e2fsck/problem.c:1165 #, c-format #. @-expanded: directory entry for '.' in %p (%i) is big.\n msgid "@d @e for '.' in %p (%i) is big.\n" msgstr "" -#: e2fsck/problem.c:1153 +#: e2fsck/problem.c:1170 #. @-expanded: inode %i (%Q) is an illegal FIFO.\n msgid "@i %i (%Q) is an @I FIFO.\n" msgstr "" -#: e2fsck/problem.c:1158 +#: e2fsck/problem.c:1175 #. @-expanded: inode %i (%Q) is an illegal socket.\n msgid "@i %i (%Q) is an @I socket.\n" msgstr "" -#: e2fsck/problem.c:1163 +#: e2fsck/problem.c:1180 #. @-expanded: Setting filetype for entry '%Dn' in %p (%i) to %N.\n msgid "Setting filetype for @E to %N.\n" msgstr "" -#: e2fsck/problem.c:1168 +#: e2fsck/problem.c:1185 #. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n msgid "@E has an incorrect filetype (was %Dt, @s %N).\n" msgstr "" -#: e2fsck/problem.c:1173 +#: e2fsck/problem.c:1190 #. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n msgid "@E has filetype set.\n" msgstr "" -#: e2fsck/problem.c:1178 +#: e2fsck/problem.c:1195 #. @-expanded: entry '%Dn' in %p (%i) has a zero-length name.\n msgid "@E has a @z name.\n" msgstr "" -#: e2fsck/problem.c:1183 +#: e2fsck/problem.c:1200 #. @-expanded: Symlink %Q (inode #%i) is invalid.\n msgid "Symlink %Q (@i #%i) is @n.\n" msgstr "" -#: e2fsck/problem.c:1188 +#: e2fsck/problem.c:1205 #. @-expanded: extended attribute block for inode %i (%Q) is invalid (%If).\n msgid "@a @b @F @n (%If).\n" msgstr "" -#: e2fsck/problem.c:1193 +#: e2fsck/problem.c:1210 #. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n" msgstr "" -#: e2fsck/problem.c:1198 -#. @-expanded: problem in HTREE directory inode %d: node (%B) not referenced\n -msgid "@p @h %d: node (%B) not referenced\n" +#: e2fsck/problem.c:1215 +#. @-expanded: problem in HTREE directory inode %d: %B not referenced\n +msgid "@p @h %d: %B not referenced\n" msgstr "" -#: e2fsck/problem.c:1203 -#. @-expanded: problem in HTREE directory inode %d: node (%B) referenced twice\n -msgid "@p @h %d: node (%B) referenced twice\n" +#: e2fsck/problem.c:1220 +#. @-expanded: problem in HTREE directory inode %d: %B referenced twice\n +msgid "@p @h %d: %B referenced twice\n" msgstr "" -#: e2fsck/problem.c:1208 -#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad min hash\n -msgid "@p @h %d: node (%B) has bad min hash\n" +#: e2fsck/problem.c:1225 +#. @-expanded: problem in HTREE directory inode %d: %B has bad min hash\n +msgid "@p @h %d: %B has bad min hash\n" msgstr "" -#: e2fsck/problem.c:1213 -#. @-expanded: problem in HTREE directory inode %d: node (%B) has bad max hash\n -msgid "@p @h %d: node (%B) has bad max hash\n" +#: e2fsck/problem.c:1230 +#. @-expanded: problem in HTREE directory inode %d: %B has bad max hash\n +msgid "@p @h %d: %B has bad max hash\n" msgstr "" -#: e2fsck/problem.c:1218 +#: e2fsck/problem.c:1235 #. @-expanded: invalid HTREE directory inode %d (%q). msgid "@n @h %d (%q). " msgstr "" -#: e2fsck/problem.c:1222 +#: e2fsck/problem.c:1239 #. @-expanded: problem in HTREE directory inode %d (%q): bad block number %b.\n msgid "@p @h %d (%q): bad @b number %b.\n" msgstr "" -#: e2fsck/problem.c:1232 +#: e2fsck/problem.c:1249 #, c-format #. @-expanded: problem in HTREE directory inode %d: root node is invalid\n msgid "@p @h %d: root node is @n\n" msgstr "" -#: e2fsck/problem.c:1237 -#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid limit (%N)\n -msgid "@p @h %d: node (%B) has @n limit (%N)\n" +#: e2fsck/problem.c:1254 +#. @-expanded: problem in HTREE directory inode %d: %B has invalid limit (%N)\n +msgid "@p @h %d: %B has @n limit (%N)\n" msgstr "" -#: e2fsck/problem.c:1242 -#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid count (%N)\n -msgid "@p @h %d: node (%B) has @n count (%N)\n" +#: e2fsck/problem.c:1259 +#. @-expanded: problem in HTREE directory inode %d: %B has invalid count (%N)\n +msgid "@p @h %d: %B has @n count (%N)\n" msgstr "" -#: e2fsck/problem.c:1247 -#. @-expanded: problem in HTREE directory inode %d: node (%B) has an unordered hash table\n -msgid "@p @h %d: node (%B) has an unordered hash table\n" +#: e2fsck/problem.c:1264 +#. @-expanded: problem in HTREE directory inode %d: %B has an unordered hash table\n +msgid "@p @h %d: %B has an unordered hash table\n" msgstr "" -#: e2fsck/problem.c:1252 -#. @-expanded: problem in HTREE directory inode %d: node (%B) has invalid depth (%N)\n -msgid "@p @h %d: node (%B) has @n depth (%N)\n" +#: e2fsck/problem.c:1269 +#. @-expanded: problem in HTREE directory inode %d: %B has invalid depth (%N)\n +msgid "@p @h %d: %B has @n depth (%N)\n" msgstr "" -#: e2fsck/problem.c:1257 +#: e2fsck/problem.c:1274 #. @-expanded: Duplicate entry '%Dn' in %p (%i) found. msgid "Duplicate @E found. " msgstr "" -#: e2fsck/problem.c:1262 +#: e2fsck/problem.c:1279 #, no-c-format #. @-expanded: entry '%Dn' in %p (%i) has a non-unique filename.\n #. @-expanded: Rename to %s @@ -1990,7 +2040,7 @@ msgid "" "Rename to %s" msgstr "" -#: e2fsck/problem.c:1267 +#: e2fsck/problem.c:1284 #. @-expanded: Duplicate entry '%Dn' found.\n #. @-expanded: \tMarking %p (%i) to be rebuilt.\n #. @-expanded: \n @@ -2000,115 +2050,115 @@ msgid "" "\n" msgstr "" -#: e2fsck/problem.c:1272 +#: e2fsck/problem.c:1289 #. @-expanded: i_blocks_hi for inode %i (%Q) is %N, should be zero.\n msgid "i_blocks_hi @F %N, @s zero.\n" msgstr "" -#: e2fsck/problem.c:1277 +#: e2fsck/problem.c:1294 #. @-expanded: Unexpected block in HTREE directory inode %d (%q).\n msgid "Unexpected @b in @h %d (%q).\n" msgstr "" -#: e2fsck/problem.c:1281 +#: e2fsck/problem.c:1298 #. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n" msgstr "" -#: e2fsck/problem.c:1286 +#: e2fsck/problem.c:1303 #. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n msgid "@E references @i %Di found in @g %g's unused inodes area.\n" msgstr "" -#: e2fsck/problem.c:1291 +#: e2fsck/problem.c:1308 #. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n msgid "i_file_acl_hi @F %N, @s zero.\n" msgstr "" -#: e2fsck/problem.c:1298 +#: e2fsck/problem.c:1315 #. @-expanded: Pass 3: Checking directory connectivity\n msgid "Pass 3: Checking @d connectivity\n" msgstr "" -#: e2fsck/problem.c:1303 +#: e2fsck/problem.c:1320 #. @-expanded: root inode not allocated. msgid "@r not allocated. " msgstr "" -#: e2fsck/problem.c:1308 +#: e2fsck/problem.c:1325 #. @-expanded: No room in lost+found directory. msgid "No room in @l @d. " msgstr "" -#: e2fsck/problem.c:1313 +#: e2fsck/problem.c:1330 #, c-format #. @-expanded: Unconnected directory inode %i (%p)\n msgid "Unconnected @d @i %i (%p)\n" msgstr "" -#: e2fsck/problem.c:1318 +#: e2fsck/problem.c:1335 #. @-expanded: /lost+found not found. msgid "/@l not found. " msgstr "" -#: e2fsck/problem.c:1323 +#: e2fsck/problem.c:1340 #. @-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:1328 +#: e2fsck/problem.c:1345 #. @-expanded: Bad or non-existent /lost+found. Cannot reconnect.\n msgid "Bad or non-existent /@l. Cannot reconnect.\n" msgstr "" -#: e2fsck/problem.c:1333 +#: e2fsck/problem.c:1350 #, c-format #. @-expanded: Could not expand /lost+found: %m\n msgid "Could not expand /@l: %m\n" msgstr "" -#: e2fsck/problem.c:1338 +#: e2fsck/problem.c:1355 #, c-format msgid "Could not reconnect %i: %m\n" msgstr "" -#: e2fsck/problem.c:1343 +#: e2fsck/problem.c:1360 #, 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:1348 +#: e2fsck/problem.c:1365 #, 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:1353 +#: e2fsck/problem.c:1370 #, 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:1358 +#: e2fsck/problem.c:1375 #, 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:1363 +#: e2fsck/problem.c:1380 #, 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:1368 +#: e2fsck/problem.c:1385 #, 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:1373 +#: e2fsck/problem.c:1390 #, c-format #. @-expanded: Couldn't fix parent of inode %i: %m\n #. @-expanded: \n @@ -2117,7 +2167,7 @@ msgid "" "\n" msgstr "" -#: e2fsck/problem.c:1378 +#: e2fsck/problem.c:1395 #, c-format #. @-expanded: Couldn't fix parent of inode %i: Couldn't find parent directory entry\n #. @-expanded: \n @@ -2126,73 +2176,73 @@ msgid "" "\n" msgstr "" -#: e2fsck/problem.c:1388 +#: e2fsck/problem.c:1405 #, c-format #. @-expanded: Error creating root directory (%s): %m\n msgid "Error creating root @d (%s): %m\n" msgstr "" -#: e2fsck/problem.c:1393 +#: e2fsck/problem.c:1410 #, c-format #. @-expanded: Error creating /lost+found directory (%s): %m\n msgid "Error creating /@l @d (%s): %m\n" msgstr "" -#: e2fsck/problem.c:1398 +#: e2fsck/problem.c:1415 #. @-expanded: root inode is not a directory; aborting.\n msgid "@r is not a @d; aborting.\n" msgstr "" -#: e2fsck/problem.c:1403 +#: e2fsck/problem.c:1420 #. @-expanded: Cannot proceed without a root inode.\n msgid "Cannot proceed without a @r.\n" msgstr "" -#: e2fsck/problem.c:1413 +#: e2fsck/problem.c:1430 #, 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:1420 +#: e2fsck/problem.c:1437 msgid "Pass 3A: Optimizing directories\n" msgstr "" -#: e2fsck/problem.c:1425 +#: e2fsck/problem.c:1442 #, c-format msgid "Failed to create dirs_to_hash iterator: %m\n" msgstr "" -#: e2fsck/problem.c:1430 +#: e2fsck/problem.c:1447 msgid "Failed to optimize directory %q (%d): %m\n" msgstr "" -#: e2fsck/problem.c:1435 +#: e2fsck/problem.c:1452 msgid "Optimizing directories: " msgstr "" -#: e2fsck/problem.c:1452 +#: e2fsck/problem.c:1469 msgid "Pass 4: Checking reference counts\n" msgstr "" -#: e2fsck/problem.c:1457 +#: e2fsck/problem.c:1474 #, c-format #. @-expanded: unattached zero-length inode %i. msgid "@u @z @i %i. " msgstr "" -#: e2fsck/problem.c:1462 +#: e2fsck/problem.c:1479 #, c-format #. @-expanded: unattached inode %i\n msgid "@u @i %i\n" msgstr "" -#: e2fsck/problem.c:1467 +#: e2fsck/problem.c:1484 #. @-expanded: inode %i ref count is %Il, should be %N. msgid "@i %i ref count is %Il, @s %N. " msgstr "" -#: e2fsck/problem.c:1471 +#: e2fsck/problem.c:1488 #. @-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 @@ -2202,57 +2252,57 @@ msgid "" "@i_link_info[%i] is %N, @i.i_links_count is %Il. They @s the same!\n" msgstr "" -#: e2fsck/problem.c:1481 +#: e2fsck/problem.c:1498 #. @-expanded: Pass 5: Checking group summary information\n msgid "Pass 5: Checking @g summary information\n" msgstr "" -#: e2fsck/problem.c:1486 +#: e2fsck/problem.c:1503 #. @-expanded: Padding at end of inode bitmap is not set. msgid "Padding at end of @i @B is not set. " msgstr "" -#: e2fsck/problem.c:1491 +#: e2fsck/problem.c:1508 #. @-expanded: Padding at end of block bitmap is not set. msgid "Padding at end of @b @B is not set. " msgstr "" -#: e2fsck/problem.c:1496 +#: e2fsck/problem.c:1513 #. @-expanded: block bitmap differences: msgid "@b @B differences: " msgstr "" -#: e2fsck/problem.c:1516 +#: e2fsck/problem.c:1533 #. @-expanded: inode bitmap differences: msgid "@i @B differences: " msgstr "" -#: e2fsck/problem.c:1536 +#: e2fsck/problem.c:1553 #. @-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:1541 +#: e2fsck/problem.c:1558 #. @-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:1546 +#: e2fsck/problem.c:1563 #. @-expanded: Free inodes count wrong (%i, counted=%j).\n msgid "Free @is count wrong (%i, counted=%j).\n" msgstr "" -#: e2fsck/problem.c:1551 +#: e2fsck/problem.c:1568 #. @-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:1556 +#: e2fsck/problem.c:1573 #. @-expanded: Free blocks count wrong (%b, counted=%c).\n msgid "Free @bs count wrong (%b, counted=%c).\n" msgstr "" -#: e2fsck/problem.c:1561 +#: e2fsck/problem.c:1578 #. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap #. @-expanded: endpoints (%i, %j)\n msgid "" @@ -2260,45 +2310,45 @@ msgid "" "endpoints (%i, %j)\n" msgstr "" -#: e2fsck/problem.c:1567 +#: e2fsck/problem.c:1584 msgid "Internal error: fudging end of bitmap (%N)\n" msgstr "" -#: e2fsck/problem.c:1572 +#: e2fsck/problem.c:1589 #, c-format #. @-expanded: Error copying in replacement inode bitmap: %m\n msgid "Error copying in replacement @i @B: %m\n" msgstr "" -#: e2fsck/problem.c:1577 +#: e2fsck/problem.c:1594 #, c-format #. @-expanded: Error copying in replacement block bitmap: %m\n msgid "Error copying in replacement @b @B: %m\n" msgstr "" -#: e2fsck/problem.c:1602 +#: e2fsck/problem.c:1619 #, 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:1607 +#: e2fsck/problem.c:1624 #, 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:1614 +#: e2fsck/problem.c:1631 #. @-expanded: Recreate journal msgid "Recreate @j" msgstr "" -#: e2fsck/problem.c:1732 +#: e2fsck/problem.c:1750 #, c-format msgid "Unhandled error code (0x%x)!\n" msgstr "" -#: e2fsck/problem.c:1827 +#: e2fsck/problem.c:1854 msgid "IGNORED" msgstr "" @@ -2386,7 +2436,7 @@ msgstr "" msgid " Extent depth histogram: " msgstr "" -#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1584 misc/util.c:151 +#: e2fsck/unix.c:207 misc/badblocks.c:928 misc/tune2fs.c:1625 misc/util.c:151 #: resize/main.c:249 #, c-format msgid "while determining whether %s is mounted." @@ -2558,25 +2608,25 @@ msgstr "" msgid "need terminal for interactive repairs" msgstr "" -#: e2fsck/unix.c:1021 +#: e2fsck/unix.c:1025 #, c-format msgid "%s: %s trying backup blocks...\n" msgstr "" -#: e2fsck/unix.c:1023 +#: e2fsck/unix.c:1027 msgid "Superblock invalid," msgstr "" -#: e2fsck/unix.c:1024 +#: e2fsck/unix.c:1028 msgid "Group descriptors look bad..." msgstr "" -#: e2fsck/unix.c:1034 +#: e2fsck/unix.c:1038 #, c-format msgid "%s: going back to original superblock\n" msgstr "" -#: e2fsck/unix.c:1060 +#: e2fsck/unix.c:1065 #, c-format msgid "" "The filesystem revision is apparently too high for this version of e2fsck.\n" @@ -2584,142 +2634,142 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:1066 +#: e2fsck/unix.c:1071 #, c-format msgid "Could this be a zero-length partition?\n" msgstr "" -#: e2fsck/unix.c:1068 +#: e2fsck/unix.c:1073 #, c-format msgid "You must have %s access to the filesystem or be root\n" msgstr "" -#: e2fsck/unix.c:1073 +#: e2fsck/unix.c:1078 #, c-format msgid "Possibly non-existent or swap device?\n" msgstr "" -#: e2fsck/unix.c:1075 +#: e2fsck/unix.c:1080 #, c-format msgid "Filesystem mounted or opened exclusively by another program?\n" msgstr "" -#: e2fsck/unix.c:1079 +#: e2fsck/unix.c:1084 #, 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:1143 +#: e2fsck/unix.c:1148 msgid "Get a newer version of e2fsck!" msgstr "" -#: e2fsck/unix.c:1173 +#: e2fsck/unix.c:1178 #, c-format msgid "while checking ext3 journal for %s" msgstr "" -#: e2fsck/unix.c:1184 +#: e2fsck/unix.c:1189 #, c-format msgid "" "Warning: skipping journal recovery because doing a read-only filesystem " "check.\n" msgstr "" -#: e2fsck/unix.c:1197 +#: e2fsck/unix.c:1202 #, c-format msgid "unable to set superblock flags on %s\n" msgstr "" -#: e2fsck/unix.c:1203 +#: e2fsck/unix.c:1208 #, c-format msgid "while recovering ext3 journal of %s" msgstr "" -#: e2fsck/unix.c:1228 +#: e2fsck/unix.c:1233 #, c-format msgid "%s has unsupported feature(s):" msgstr "" -#: e2fsck/unix.c:1244 +#: e2fsck/unix.c:1249 msgid "Warning: compression support is experimental.\n" msgstr "" -#: e2fsck/unix.c:1249 +#: e2fsck/unix.c:1254 #, c-format msgid "" "E2fsck not compiled with HTREE support,\n" "\tbut filesystem %s has HTREE directories.\n" msgstr "" -#: e2fsck/unix.c:1302 +#: e2fsck/unix.c:1307 msgid "while reading bad blocks inode" msgstr "" -#: e2fsck/unix.c:1304 +#: e2fsck/unix.c:1309 #, c-format msgid "This doesn't bode well, but we'll try to go on...\n" msgstr "" -#: e2fsck/unix.c:1330 +#: e2fsck/unix.c:1335 msgid "Couldn't determine journal size" msgstr "" -#: e2fsck/unix.c:1333 +#: e2fsck/unix.c:1338 #, c-format msgid "Creating journal (%d blocks): " msgstr "" -#: e2fsck/unix.c:1340 misc/mke2fs.c:2113 +#: e2fsck/unix.c:1345 misc/mke2fs.c:2226 msgid "" "\n" "\twhile trying to create journal" msgstr "" -#: e2fsck/unix.c:1343 +#: e2fsck/unix.c:1348 #, c-format msgid " Done.\n" msgstr "" -#: e2fsck/unix.c:1344 +#: e2fsck/unix.c:1349 #, c-format msgid "" "\n" "*** journal has been re-created - filesystem is now ext3 again ***\n" msgstr "" -#: e2fsck/unix.c:1351 +#: e2fsck/unix.c:1356 #, c-format msgid "Restarting e2fsck from the beginning...\n" msgstr "" -#: e2fsck/unix.c:1355 +#: e2fsck/unix.c:1360 msgid "while resetting context" msgstr "" -#: e2fsck/unix.c:1362 +#: e2fsck/unix.c:1367 #, c-format msgid "%s: e2fsck canceled.\n" msgstr "" -#: e2fsck/unix.c:1367 +#: e2fsck/unix.c:1372 msgid "aborted" msgstr "" -#: e2fsck/unix.c:1379 +#: e2fsck/unix.c:1384 #, c-format msgid "" "\n" "%s: ***** FILE SYSTEM WAS MODIFIED *****\n" msgstr "" -#: e2fsck/unix.c:1382 +#: e2fsck/unix.c:1387 #, c-format msgid "%s: ***** REBOOT LINUX *****\n" msgstr "" -#: e2fsck/unix.c:1390 +#: e2fsck/unix.c:1395 #, c-format msgid "" "\n" @@ -2727,7 +2777,7 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:1426 +#: e2fsck/unix.c:1431 msgid "while setting block group checksum info" msgstr "" @@ -3092,7 +3142,7 @@ msgstr "" #: misc/dumpe2fs.c:53 #, c-format -msgid "Usage: %s [-bfhixV] [-ob superblock] [-oB blocksize] device\n" +msgid "Usage: %s [-bfhixV] [-o superblock=] [-o blocksize=] device\n" msgstr "" #: misc/dumpe2fs.c:168 @@ -3178,23 +3228,44 @@ msgstr "" msgid "Bad blocks: %u" msgstr "" -#: misc/dumpe2fs.c:297 misc/tune2fs.c:281 +#: misc/dumpe2fs.c:301 misc/tune2fs.c:281 msgid "while reading journal inode" msgstr "" -#: misc/dumpe2fs.c:300 +#: misc/dumpe2fs.c:307 +msgid "while opening journal inode" +msgstr "" + +#: misc/dumpe2fs.c:313 +msgid "while reading journal super block" +msgstr "" + +#: misc/dumpe2fs.c:323 +#, c-format +msgid "Journal features: " +msgstr "" + +#: misc/dumpe2fs.c:336 msgid "Journal size: " msgstr "" -#: misc/dumpe2fs.c:324 misc/tune2fs.c:202 +#: misc/dumpe2fs.c:347 +#, c-format +msgid "" +"Journal length: %u\n" +"Journal sequence: 0x%08x\n" +"Journal start: %u\n" +msgstr "" + +#: misc/dumpe2fs.c:366 misc/tune2fs.c:202 msgid "while reading journal superblock" msgstr "" -#: misc/dumpe2fs.c:332 +#: misc/dumpe2fs.c:374 msgid "Couldn't find journal superblock magic numbers" msgstr "" -#: misc/dumpe2fs.c:336 +#: misc/dumpe2fs.c:378 #, c-format msgid "" "\n" @@ -3206,27 +3277,27 @@ msgid "" "Journal number of users: %u\n" msgstr "" -#: misc/dumpe2fs.c:349 +#: misc/dumpe2fs.c:391 #, c-format msgid "Journal users: %s\n" msgstr "" -#: misc/dumpe2fs.c:365 misc/mke2fs.c:693 misc/tune2fs.c:872 +#: misc/dumpe2fs.c:407 misc/mke2fs.c:699 misc/tune2fs.c:872 #, c-format msgid "Couldn't allocate memory to parse options!\n" msgstr "" -#: misc/dumpe2fs.c:391 +#: misc/dumpe2fs.c:433 #, c-format msgid "Invalid superblock parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:406 +#: misc/dumpe2fs.c:448 #, c-format msgid "Invalid blocksize parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:417 +#: misc/dumpe2fs.c:459 #, c-format msgid "" "\n" @@ -3240,18 +3311,18 @@ msgid "" "\tblocksize=\n" msgstr "" -#: misc/dumpe2fs.c:476 misc/mke2fs.c:1355 +#: misc/dumpe2fs.c:518 misc/mke2fs.c:1406 #, c-format msgid "\tUsing %s\n" msgstr "" -#: misc/dumpe2fs.c:512 misc/e2image.c:681 misc/tune2fs.c:1535 +#: misc/dumpe2fs.c:554 misc/e2image.c:681 misc/tune2fs.c:1576 #: resize/main.c:312 #, c-format msgid "Couldn't find valid filesystem superblock.\n" msgstr "" -#: misc/dumpe2fs.c:537 +#: misc/dumpe2fs.c:579 #, c-format msgid "" "\n" @@ -3308,7 +3379,7 @@ msgstr "" msgid "e2label: not an ext2 filesystem\n" msgstr "" -#: misc/e2label.c:96 misc/tune2fs.c:1670 +#: misc/e2label.c:96 misc/tune2fs.c:1711 #, c-format msgid "Warning: label too long, truncating.\n" msgstr "" @@ -3337,7 +3408,7 @@ msgstr "" msgid "Failed to read the file system data \n" msgstr "" -#: misc/e2undo.c:62 misc/e2undo.c:83 misc/e2undo.c:108 misc/e2undo.c:204 +#: misc/e2undo.c:62 misc/e2undo.c:83 misc/e2undo.c:108 misc/e2undo.c:205 #, c-format msgid "Failed tdb_fetch %s\n" msgstr "" @@ -3351,31 +3422,31 @@ msgstr "" msgid "The file system UUID didn't match \n" msgstr "" -#: misc/e2undo.c:161 +#: misc/e2undo.c:162 #, c-format msgid "Failed tdb_open %s\n" msgstr "" -#: misc/e2undo.c:167 +#: misc/e2undo.c:168 #, c-format msgid "Error while determining whether %s is mounted.\n" msgstr "" -#: misc/e2undo.c:173 +#: misc/e2undo.c:174 msgid "e2undo should only be run on unmounted file system\n" msgstr "" -#: misc/e2undo.c:182 +#: misc/e2undo.c:183 #, c-format msgid "Failed to open %s\n" msgstr "" -#: misc/e2undo.c:208 +#: misc/e2undo.c:209 #, c-format msgid "Replayed transaction of size %zd at location %ld\n" msgstr "" -#: misc/e2undo.c:214 +#: misc/e2undo.c:215 #, c-format msgid "Failed write %s\n" msgstr "" @@ -3489,7 +3560,7 @@ msgstr "" msgid "While reading version on %s" msgstr "" -#: misc/mke2fs.c:104 +#: misc/mke2fs.c:108 #, c-format msgid "" "Usage: %s [-c|-l filename] [-b block-size] [-f fragment-size]\n" @@ -3498,38 +3569,38 @@ msgid "" "\t[-m reserved-blocks-percentage] [-o creator-os]\n" "\t[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]\n" "\t[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]\n" -"\t[-T fs-type] [-U UUID] [-jnqvFSV] device [blocks-count]\n" +"\t[-T fs-type] [-U UUID] [-jnqvFKSV] device [blocks-count]\n" msgstr "" -#: misc/mke2fs.c:206 +#: misc/mke2fs.c:210 #, c-format msgid "Running command: %s\n" msgstr "" -#: misc/mke2fs.c:210 +#: misc/mke2fs.c:214 #, c-format msgid "while trying to run '%s'" msgstr "" -#: misc/mke2fs.c:217 +#: misc/mke2fs.c:221 msgid "while processing list of bad blocks from program" msgstr "" -#: misc/mke2fs.c:244 +#: misc/mke2fs.c:248 #, c-format msgid "Block %d in primary superblock/group descriptor area bad.\n" msgstr "" -#: misc/mke2fs.c:246 +#: misc/mke2fs.c:250 #, c-format msgid "Blocks %u through %u must be good in order to build a filesystem.\n" msgstr "" -#: misc/mke2fs.c:249 +#: misc/mke2fs.c:253 msgid "Aborting....\n" msgstr "" -#: misc/mke2fs.c:269 +#: misc/mke2fs.c:273 #, c-format msgid "" "Warning: the backup superblock/group descriptors at block %u contain\n" @@ -3537,182 +3608,187 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:288 +#: misc/mke2fs.c:292 msgid "while marking bad blocks as used" msgstr "" -#: misc/mke2fs.c:346 +#: misc/mke2fs.c:350 msgid "done \n" msgstr "" -#: misc/mke2fs.c:360 +#: misc/mke2fs.c:364 msgid "Writing inode tables: " msgstr "" -#: misc/mke2fs.c:383 +#: misc/mke2fs.c:387 #, c-format msgid "" "\n" "Could not write %d blocks in inode table starting at %u: %s\n" msgstr "" -#: misc/mke2fs.c:407 +#: misc/mke2fs.c:411 msgid "while creating root dir" msgstr "" -#: misc/mke2fs.c:414 +#: misc/mke2fs.c:418 msgid "while reading root inode" msgstr "" -#: misc/mke2fs.c:428 +#: misc/mke2fs.c:432 msgid "while setting root inode ownership" msgstr "" -#: misc/mke2fs.c:446 +#: misc/mke2fs.c:450 msgid "while creating /lost+found" msgstr "" -#: misc/mke2fs.c:453 +#: misc/mke2fs.c:457 msgid "while looking up /lost+found" msgstr "" -#: misc/mke2fs.c:466 +#: misc/mke2fs.c:470 msgid "while expanding /lost+found" msgstr "" -#: misc/mke2fs.c:481 +#: misc/mke2fs.c:485 msgid "while setting bad block inode" msgstr "" -#: misc/mke2fs.c:508 +#: misc/mke2fs.c:512 #, c-format msgid "Out of memory erasing sectors %d-%d\n" msgstr "" -#: misc/mke2fs.c:518 +#: misc/mke2fs.c:522 #, c-format msgid "Warning: could not read block 0: %s\n" msgstr "" -#: misc/mke2fs.c:534 +#: misc/mke2fs.c:538 #, c-format msgid "Warning: could not erase sector %d: %s\n" msgstr "" -#: misc/mke2fs.c:550 +#: misc/mke2fs.c:554 msgid "while initializing journal superblock" msgstr "" -#: misc/mke2fs.c:556 +#: misc/mke2fs.c:560 msgid "Zeroing journal device: " msgstr "" -#: misc/mke2fs.c:569 +#: misc/mke2fs.c:573 #, c-format msgid "while zeroing journal device (block %u, count %d)" msgstr "" -#: misc/mke2fs.c:585 +#: misc/mke2fs.c:589 msgid "while writing journal superblock" msgstr "" -#: misc/mke2fs.c:601 +#: misc/mke2fs.c:605 #, c-format msgid "" "warning: %u blocks unused.\n" "\n" msgstr "" -#: misc/mke2fs.c:606 +#: misc/mke2fs.c:610 #, c-format msgid "Filesystem label=%s\n" msgstr "" -#: misc/mke2fs.c:607 +#: misc/mke2fs.c:611 msgid "OS type: " msgstr "" -#: misc/mke2fs.c:612 +#: misc/mke2fs.c:616 #, c-format msgid "Block size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:614 +#: misc/mke2fs.c:618 #, c-format msgid "Fragment size=%u (log=%u)\n" msgstr "" -#: misc/mke2fs.c:616 +#: misc/mke2fs.c:620 +#, c-format +msgid "Stride=%u blocks, Stripe width=%u blocks\n" +msgstr "" + +#: misc/mke2fs.c:622 #, c-format msgid "%u inodes, %u blocks\n" msgstr "" -#: misc/mke2fs.c:618 +#: misc/mke2fs.c:624 #, c-format msgid "%u blocks (%2.2f%%) reserved for the super user\n" msgstr "" -#: misc/mke2fs.c:621 +#: misc/mke2fs.c:627 #, c-format msgid "First data block=%u\n" msgstr "" -#: misc/mke2fs.c:623 +#: misc/mke2fs.c:629 #, c-format msgid "Maximum filesystem blocks=%lu\n" msgstr "" -#: misc/mke2fs.c:627 +#: misc/mke2fs.c:633 #, c-format msgid "%u block groups\n" msgstr "" -#: misc/mke2fs.c:629 +#: misc/mke2fs.c:635 #, c-format msgid "%u block group\n" msgstr "" -#: misc/mke2fs.c:630 +#: misc/mke2fs.c:636 #, c-format msgid "%u blocks per group, %u fragments per group\n" msgstr "" -#: misc/mke2fs.c:632 +#: misc/mke2fs.c:638 #, c-format msgid "%u inodes per group\n" msgstr "" -#: misc/mke2fs.c:639 +#: misc/mke2fs.c:645 #, c-format msgid "Superblock backups stored on blocks: " msgstr "" -#: misc/mke2fs.c:718 +#: misc/mke2fs.c:724 #, c-format msgid "Invalid stride parameter: %s\n" msgstr "" -#: misc/mke2fs.c:733 +#: misc/mke2fs.c:739 #, c-format msgid "Invalid stripe-width parameter: %s\n" msgstr "" -#: misc/mke2fs.c:755 +#: misc/mke2fs.c:761 #, c-format msgid "Invalid resize parameter: %s\n" msgstr "" -#: misc/mke2fs.c:762 +#: misc/mke2fs.c:768 #, c-format msgid "The resize maximum must be greater than the filesystem size.\n" msgstr "" -#: misc/mke2fs.c:786 +#: misc/mke2fs.c:792 #, c-format msgid "On-line resizing not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:808 +#: misc/mke2fs.c:814 #, c-format msgid "" "\n" @@ -3730,7 +3806,7 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:824 +#: misc/mke2fs.c:830 #, c-format msgid "" "\n" @@ -3738,150 +3814,150 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:856 +#: misc/mke2fs.c:862 #, c-format msgid "" "Syntax error in mke2fs config file (%s, line #%d)\n" "\t%s\n" msgstr "" -#: misc/mke2fs.c:869 misc/tune2fs.c:355 +#: misc/mke2fs.c:875 misc/tune2fs.c:355 #, c-format msgid "Invalid filesystem option set: %s\n" msgstr "" -#: misc/mke2fs.c:979 +#: misc/mke2fs.c:985 #, c-format msgid "" "\n" "Warning! Your mke2fs.conf file does not define the %s filesystem type.\n" msgstr "" -#: misc/mke2fs.c:982 +#: misc/mke2fs.c:988 #, c-format msgid "" "You probably need to install an updated mke2fs.conf file.\n" "\n" msgstr "" -#: misc/mke2fs.c:1176 +#: misc/mke2fs.c:1224 #, c-format msgid "invalid block size - %s" msgstr "" -#: misc/mke2fs.c:1180 +#: misc/mke2fs.c:1228 #, c-format msgid "Warning: blocksize %d not usable on most systems.\n" msgstr "" -#: misc/mke2fs.c:1196 +#: misc/mke2fs.c:1244 #, c-format msgid "invalid fragment size - %s" msgstr "" -#: misc/mke2fs.c:1202 +#: misc/mke2fs.c:1250 #, c-format msgid "Warning: fragments not supported. Ignoring -f option\n" msgstr "" -#: misc/mke2fs.c:1209 +#: misc/mke2fs.c:1257 msgid "Illegal number for blocks per group" msgstr "" -#: misc/mke2fs.c:1214 +#: misc/mke2fs.c:1262 msgid "blocks per group must be multiple of 8" msgstr "" -#: misc/mke2fs.c:1222 +#: misc/mke2fs.c:1270 msgid "Illegal number for flex_bg size" msgstr "" -#: misc/mke2fs.c:1228 +#: misc/mke2fs.c:1276 msgid "flex_bg size must be a power of 2" msgstr "" -#: misc/mke2fs.c:1238 +#: misc/mke2fs.c:1286 #, c-format msgid "invalid inode ratio %s (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:1255 +#: misc/mke2fs.c:1306 msgid "in malloc for bad_blocks_filename" msgstr "" -#: misc/mke2fs.c:1265 +#: misc/mke2fs.c:1316 #, c-format msgid "invalid reserved blocks percent - %s" msgstr "" -#: misc/mke2fs.c:1283 +#: misc/mke2fs.c:1334 #, c-format msgid "bad revision level - %s" msgstr "" -#: misc/mke2fs.c:1295 +#: misc/mke2fs.c:1346 #, c-format msgid "invalid inode size - %s" msgstr "" -#: misc/mke2fs.c:1315 +#: misc/mke2fs.c:1366 #, c-format msgid "bad num inodes - %s" msgstr "" -#: misc/mke2fs.c:1380 misc/mke2fs.c:2068 +#: misc/mke2fs.c:1431 misc/mke2fs.c:2181 #, c-format msgid "while trying to open journal device %s\n" msgstr "" -#: misc/mke2fs.c:1386 +#: misc/mke2fs.c:1437 #, c-format msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n" msgstr "" -#: misc/mke2fs.c:1392 +#: misc/mke2fs.c:1443 #, c-format msgid "Using journal device's blocksize: %d\n" msgstr "" -#: misc/mke2fs.c:1401 +#: misc/mke2fs.c:1452 #, c-format msgid "%d-byte blocks too big for system (max %d)" msgstr "" -#: misc/mke2fs.c:1405 +#: misc/mke2fs.c:1456 #, c-format msgid "" "Warning: %d-byte blocks too big for system (max %d), forced to continue\n" msgstr "" -#: misc/mke2fs.c:1413 +#: misc/mke2fs.c:1464 #, c-format msgid "invalid blocks count - %s" msgstr "" -#: misc/mke2fs.c:1423 +#: misc/mke2fs.c:1474 msgid "filesystem" msgstr "" -#: misc/mke2fs.c:1459 +#: misc/mke2fs.c:1510 #, 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:1468 resize/main.c:374 +#: misc/mke2fs.c:1519 resize/main.c:374 msgid "while trying to determine filesystem size" msgstr "" -#: misc/mke2fs.c:1475 +#: misc/mke2fs.c:1526 msgid "" "Couldn't determine device size; you must specify\n" "the size of the filesystem\n" msgstr "" -#: misc/mke2fs.c:1482 +#: misc/mke2fs.c:1533 msgid "" "Device size reported to be zero. Invalid partition specified, or\n" "\tpartition table wasn't reread after running fdisk, due to\n" @@ -3889,73 +3965,89 @@ msgid "" "\tto re-read your partition table.\n" msgstr "" -#: misc/mke2fs.c:1500 +#: misc/mke2fs.c:1551 msgid "Filesystem larger than apparent device size." msgstr "" -#: misc/mke2fs.c:1506 +#: misc/mke2fs.c:1557 #, c-format msgid "Failed to parse fs types list\n" msgstr "" -#: misc/mke2fs.c:1540 +#: misc/mke2fs.c:1591 msgid "fs_types for mke2fs.conf resolution: " msgstr "" -#: misc/mke2fs.c:1547 +#: misc/mke2fs.c:1598 #, c-format msgid "Filesystem features not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:1554 +#: misc/mke2fs.c:1605 #, c-format msgid "Sparse superblocks not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:1566 +#: misc/mke2fs.c:1617 #, c-format msgid "Journals not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:1584 +#: misc/mke2fs.c:1635 #, 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:1601 +#: misc/mke2fs.c:1652 msgid "while trying to determine hardware sector size" msgstr "" -#: misc/mke2fs.c:1658 +#: misc/mke2fs.c:1690 +#, c-format +msgid "warning: Unable to get device geometry for %s\n" +msgstr "" + +#: misc/mke2fs.c:1693 +#, c-format +msgid "%s alignment is offset by %lu bytes.\n" +msgstr "" + +#: misc/mke2fs.c:1695 +#, c-format +msgid "" +"This may result in very poor performance, (re)-partitioning suggested.\n" +msgstr "" + +#: misc/mke2fs.c:1724 msgid "reserved online resize blocks not supported on non-sparse filesystem" msgstr "" -#: misc/mke2fs.c:1667 +#: misc/mke2fs.c:1733 msgid "blocks per group count out of range" msgstr "" -#: misc/mke2fs.c:1682 +#: misc/mke2fs.c:1748 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified" msgstr "" -#: misc/mke2fs.c:1694 +#: misc/mke2fs.c:1760 #, c-format msgid "invalid inode size %d (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:1708 +#: misc/mke2fs.c:1774 #, c-format msgid "too many inodes (%llu), raise inode ratio?" msgstr "" -#: misc/mke2fs.c:1713 +#: misc/mke2fs.c:1779 #, c-format msgid "too many inodes (%llu), specify < 2^32 inodes" msgstr "" -#: misc/mke2fs.c:1728 +#: misc/mke2fs.c:1794 #, c-format msgid "" "inode_size (%u) * inodes_count (%u) too big for a\n" @@ -3963,16 +4055,16 @@ msgid "" "\tor lower inode count (-N).\n" msgstr "" -#: misc/mke2fs.c:1821 misc/tune2fs.c:1453 +#: misc/mke2fs.c:1887 misc/tune2fs.c:1494 msgid "Couldn't allocate memory for tdb filename\n" msgstr "" -#: misc/mke2fs.c:1834 misc/tune2fs.c:1475 +#: misc/mke2fs.c:1900 misc/tune2fs.c:1516 #, c-format msgid "while trying to delete %s" msgstr "" -#: misc/mke2fs.c:1844 +#: misc/mke2fs.c:1910 #, c-format msgid "" "Overwriting existing filesystem; this can be undone using the command:\n" @@ -3980,72 +4072,87 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:1893 -msgid "while setting up superblock" +#: misc/mke2fs.c:1947 +#, c-format +msgid "Calling BLKDISCARD from %llu to %llu " +msgstr "" + +#: misc/mke2fs.c:1950 +#, c-format +msgid "failed.\n" msgstr "" #: misc/mke2fs.c:1952 #, c-format +msgid "succeeded.\n" +msgstr "" + +#: misc/mke2fs.c:2001 +msgid "while setting up superblock" +msgstr "" + +#: misc/mke2fs.c:2065 +#, c-format msgid "unknown os - %s" msgstr "" -#: misc/mke2fs.c:2006 +#: misc/mke2fs.c:2119 msgid "while trying to allocate filesystem tables" msgstr "" -#: misc/mke2fs.c:2037 +#: misc/mke2fs.c:2150 #, c-format msgid "while zeroing block %u at end of filesystem" msgstr "" -#: misc/mke2fs.c:2050 +#: misc/mke2fs.c:2163 msgid "while reserving blocks for online resize" msgstr "" -#: misc/mke2fs.c:2061 misc/tune2fs.c:479 +#: misc/mke2fs.c:2174 misc/tune2fs.c:479 msgid "journal" msgstr "" -#: misc/mke2fs.c:2073 +#: misc/mke2fs.c:2186 #, c-format msgid "Adding journal to device %s: " msgstr "" -#: misc/mke2fs.c:2080 +#: misc/mke2fs.c:2193 #, c-format msgid "" "\n" "\twhile trying to add journal to device %s" msgstr "" -#: misc/mke2fs.c:2085 misc/mke2fs.c:2117 misc/tune2fs.c:508 misc/tune2fs.c:522 +#: misc/mke2fs.c:2198 misc/mke2fs.c:2230 misc/tune2fs.c:508 misc/tune2fs.c:522 #, c-format msgid "done\n" msgstr "" -#: misc/mke2fs.c:2094 +#: misc/mke2fs.c:2207 #, c-format msgid "Skipping journal creation in super-only mode\n" msgstr "" -#: misc/mke2fs.c:2105 +#: misc/mke2fs.c:2218 #, c-format msgid "Creating journal (%u blocks): " msgstr "" -#: misc/mke2fs.c:2122 +#: misc/mke2fs.c:2235 #, c-format msgid "Writing superblocks and filesystem accounting information: " msgstr "" -#: misc/mke2fs.c:2127 +#: misc/mke2fs.c:2240 #, c-format msgid "" "\n" "Warning, had trouble writing out superblocks." msgstr "" -#: misc/mke2fs.c:2130 +#: misc/mke2fs.c:2243 #, c-format msgid "" "done\n" @@ -4310,11 +4417,29 @@ msgid "" "\t^test_fs\n" msgstr "" -#: misc/tune2fs.c:1388 misc/tune2fs.c:1393 resize/resize2fs.c:790 +#: misc/tune2fs.c:1421 resize/resize2fs.c:790 msgid "blocks to be moved" msgstr "" -#: misc/tune2fs.c:1485 +#: misc/tune2fs.c:1424 +msgid "Failed to allocate block bitmap when increasing inode size\n" +msgstr "" + +#: misc/tune2fs.c:1430 +msgid "Not enough space to increase inode size \n" +msgstr "" + +#: misc/tune2fs.c:1435 +msgid "Failed to relocate blocks during inode resize \n" +msgstr "" + +#: misc/tune2fs.c:1467 +msgid "" +"Error in resizing the inode size.\n" +"Run e2undo to undo the file system changes. \n" +msgstr "" + +#: misc/tune2fs.c:1526 #, c-format msgid "" "To undo the tune2fs operation please run the command\n" @@ -4322,116 +4447,110 @@ msgid "" "\n" msgstr "" -#: misc/tune2fs.c:1546 +#: misc/tune2fs.c:1587 #, c-format msgid "The inode size is already %lu\n" msgstr "" -#: misc/tune2fs.c:1551 +#: misc/tune2fs.c:1592 #, c-format msgid "Shrinking the inode size is not supported\n" msgstr "" -#: misc/tune2fs.c:1594 +#: misc/tune2fs.c:1635 #, c-format msgid "Setting maximal mount count to %d\n" msgstr "" -#: misc/tune2fs.c:1600 +#: misc/tune2fs.c:1641 #, c-format msgid "Setting current mount count to %d\n" msgstr "" -#: misc/tune2fs.c:1605 +#: misc/tune2fs.c:1646 #, c-format msgid "Setting error behavior to %d\n" msgstr "" -#: misc/tune2fs.c:1610 +#: misc/tune2fs.c:1651 #, c-format msgid "Setting reserved blocks gid to %lu\n" msgstr "" -#: misc/tune2fs.c:1615 +#: misc/tune2fs.c:1656 #, c-format msgid "Setting interval between checks to %lu seconds\n" msgstr "" -#: misc/tune2fs.c:1622 +#: misc/tune2fs.c:1663 #, c-format msgid "Setting reserved blocks percentage to %g%% (%u blocks)\n" msgstr "" -#: misc/tune2fs.c:1629 +#: misc/tune2fs.c:1670 #, c-format msgid "reserved blocks count is too big (%lu)" msgstr "" -#: misc/tune2fs.c:1635 +#: misc/tune2fs.c:1676 #, c-format msgid "Setting reserved blocks count to %lu\n" msgstr "" -#: misc/tune2fs.c:1641 +#: misc/tune2fs.c:1682 msgid "" "\n" "The filesystem already has sparse superblocks.\n" msgstr "" -#: misc/tune2fs.c:1648 +#: misc/tune2fs.c:1689 #, c-format msgid "" "\n" "Sparse superblock flag set. %s" msgstr "" -#: misc/tune2fs.c:1653 +#: misc/tune2fs.c:1694 msgid "" "\n" "Clearing the sparse superflag not supported.\n" msgstr "" -#: misc/tune2fs.c:1660 +#: misc/tune2fs.c:1701 #, c-format msgid "Setting time filesystem last checked to %s\n" msgstr "" -#: misc/tune2fs.c:1666 +#: misc/tune2fs.c:1707 #, c-format msgid "Setting reserved blocks uid to %lu\n" msgstr "" -#: misc/tune2fs.c:1717 +#: misc/tune2fs.c:1758 msgid "Invalid UUID format\n" msgstr "" -#: misc/tune2fs.c:1729 +#: misc/tune2fs.c:1770 msgid "The inode size may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:1736 +#: misc/tune2fs.c:1777 msgid "" "Changing the inode size not supported for filesystems with the flex_bg\n" "feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1748 -msgid "" -"Error in resizing the inode size.\n" -"Run e2undo to undo the file system changes. \n" -msgstr "" - -#: misc/tune2fs.c:1752 +#: misc/tune2fs.c:1789 #, c-format msgid "Setting inode size %lu\n" msgstr "" -#: misc/tune2fs.c:1762 +#: misc/tune2fs.c:1799 #, c-format msgid "Setting stride size to %d\n" msgstr "" -#: misc/tune2fs.c:1767 +#: misc/tune2fs.c:1804 #, c-format msgid "Setting stripe width to %d\n" msgstr "" diff --git a/version.h b/version.h index c164191d..84218c5e 100644 --- a/version.h +++ b/version.h @@ -7,5 +7,5 @@ * redistributed under the GNU Public License. */ -#define E2FSPROGS_VERSION "1.41.9" -#define E2FSPROGS_DATE "22-Aug-2009" +#define E2FSPROGS_VERSION "1.41.10" +#define E2FSPROGS_DATE "10-Feb-2009" -- 2.11.0