diff options
| -rw-r--r-- | debian/changelog | 28 | ||||
| -rw-r--r-- | debian/source/lintian-overrides | 3 | ||||
| -rw-r--r-- | doc/RelNotes/v1.46.6.txt | 90 | ||||
| -rw-r--r-- | e2fsprogs.lsm | 10 | ||||
| -rw-r--r-- | e2fsprogs.spec | 2 | ||||
| -rw-r--r-- | po/e2fsprogs.pot | 959 | ||||
| -rw-r--r-- | version.h | 4 |
7 files changed, 611 insertions, 485 deletions
diff --git a/debian/changelog b/debian/changelog index f0eb38b93..a5e729c3d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,30 @@ -e2fsprogs (1.46.6~rc0-1) unstable; urgency=medium +e2fsprogs (1.46.6~rc1-1) unstable; urgency=medium * Trial upstream release for 1.46.6 - - -- Theodore Y. Ts'o <tytso@mit.edu> Thu, 01 Sep 2022 10:47:58 -0400 + * Debugfs's ncheck command now allows the inode number to be surrounded + by angle brackets + * Debugfs -c no longer prints a scary message on startup + * Resize2fs will round down the requested new file system size to the + nearest cluster boundary when resizing bigalloc file systems + * Avoid triggering udev in dumpe2fs and "resize2fs -P" for file systems + with MMP enabled + * Fix a bug where e2fsck could fail when specifying an undo file and an + explicit superblock number + * Fix e2image so it won't potentially loop forever for certain invalid + file systems + * Resize2fs now honors the E2FSPROGS_FAKE_TIME environment variable + * Fix tune2fs, fuse2fs, and debugsfs to update j_tail_sequence when + replaying the journal + * Add additional bullet-proofing for very badly corrupted file systems + (Addresses CVE-2022-1304) (Closes: #1010263) + * Check for and handle malloc() failures when computing the log filename + in e2fsck and in the libss library + * Tune2fs and e2fsck to accept pathames which include '=' characters + * Update and clarify's chattr's man page and usage message + * Fix tune2fs to avoid a crash if the journal replay fails and to make + sure its exit status is non-zero if there is some failure. + + -- Theodore Y. Ts'o <tytso@mit.edu> Mon, 12 Sep 2022 08:27:55 -0400 e2fsprogs (1.46.5-1) unstable; urgency=medium diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides index 5ba64bf46..ca0febe70 100644 --- a/debian/source/lintian-overrides +++ b/debian/source/lintian-overrides @@ -1,3 +1,2 @@ -e2fsprogs source: weak-library-dev-dependency ss-dev on libss2 (= ${mainBinary}) -e2fsprogs source: weak-library-dev-dependency comerr-dev on libcom-err2 (= ${mainBinary}) +e2fsprogs source: weak-library-dev-dependency e2fsprogs source: no-debian-changes diff --git a/doc/RelNotes/v1.46.6.txt b/doc/RelNotes/v1.46.6.txt new file mode 100644 index 000000000..a63450d66 --- /dev/null +++ b/doc/RelNotes/v1.46.6.txt @@ -0,0 +1,90 @@ +E2fsprogs 1.46.6 (September 12, 2022) +===================================== + +Updates/Fixes since v1.46.5: + +UI and Features +--------------- + +Debugfs's ncheck command now allows the inode number to be surrounded by +angle brackets, to be consistent with other debugfs commands. + +Debugfs no longer prints a scary message when debugfs -c (which enables +"catastrophic mode") is used. This was intended to allow debugfs to +operate on very badly corrupted file systems, but it is now sometimes +used to suppress reading the block and inode bitmaps when they are not +needed. + +Resize2fs will round down the requested new file system size to the +nearest cluster boundary when resizing bigalloc file systems. + + +Fixes +----- + +Avoid triggering udev in dumpe2fs and "resize2fs -P" for file systems +with MMP enabled by opening the device read-only when reading the MMP +block. + +Fix a bug where e2fsck could fail when specifying an undo file and an +explicit superblock number. + +Fix e2image so it won't potentially loop forever for certain invalid +file systems. + +Fix resize2fs to honor the E2FSPROGS_FAKE_TIME environment variable. +This allows embedded system builders who use resize2fs as part of their +image build process to create reproducible images. + +Fix tune2fs to avoid a crash if the journal replay fails and to make +sure its exit status is non-zero if there is some failure. + +Fix tune2fs, fuse2fs, and debugsfs to update j_tail_sequence when +replaying the journal. + +Add additional bullet-proofing for very badly corrupted file systems. +Try avoid UBSAN warnings, null pointer derferences, and other memory +bugs. (Addresses CVE-2022-1304) + +Check for and handle malloc() failures when computing the log filename +in e2fsck and in the libss library. + +Fix tune2fs and e2fsck to accept pathames which include '=' characters. +Previously arguments to tune2fs and e2fsck which included '=' characters +are presumed to be blkid specifiers such as UUID=xxx or LABEL=yyy. If a +specifier is both a valid pathname name and blkid tag name specifier, +priority is given to a blkid resolved pathname. + +Update and clarify's chattr's man page and usage message. + + +Performance, Internal Implementation, Development Support etc. +-------------------------------------------------------------- + +Update to autoconf 2.71. + +Update flags used to create shared library on Darwin/MacOS. + +Add tests/fuzz directory with fuzzers from oss-fuzz. + +Fix various Coverity and compiler warnings. + +Make tests more portable on various different OS's and system +configurations (e.g., with SELinux enabled). + +Use mallinfo2() instead of mallinfo() where avilable, since mallinfo() +is deprecated on newer glibc versions. + +E2fsck will no longer do a full scan of disconnected directory when +trying to print the parent directory, which is pointless and can slow +down e2fsck if there are a large number of disconnected directories. + +Fix the setup-schroot script to work on non-Linux platforms. + +Fix memory leaks on error paths. + +Updated config.guess and config.sub with newer versions from the FSF. + +Add Friulian translation. + +Update Chinese and Malay translations. diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm index fb8aaec15..3e8cffafa 100644 --- a/e2fsprogs.lsm +++ b/e2fsprogs.lsm @@ -1,16 +1,16 @@ Begin3 Title: EXT2 Filesystem utilities -Version: 1.46.5 -Entered-date: 2021-12-30 +Version: 1.46.6 +Entered-date: 2022-09-12 Description: The filesystem utilities for the EXT2, EXT3, and EXT4 filesystems, including e2fsck, mke2fs, dumpe2fs, and others. Keywords: utilities, filesystem, Ext2fs, ext3, ext4 Author: tytso@mit.edu (Theodore Tso) Maintained-by: tytso@mit.edu (Theodore Tso) Primary-site: ftp.kernel.org /pub/linux/kernel/people/tytso/e2fsprogs - 9308kB e2fsprogs-1.46.5.tar.gz - 1kB e2fsprogs-1.46.5.lsm + 9392kB e2fsprogs-1.46.6.tar.gz + 1kB e2fsprogs-1.46.6.lsm pAlternate-site: download.sourceforge.net /pub/sourceforge/e2fsprogs -Platforms: linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x/4.x/5.x +Platforms: linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x/4.x/5.x/6.x Copying-policy: GPL-2/LGPL-2 End diff --git a/e2fsprogs.spec b/e2fsprogs.spec index cc6aac87f..417be4901 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -5,7 +5,7 @@ Summary: Utilities for managing ext2/ext3/ext4 filesystems Name: e2fsprogs -Version: 1.46.5 +Version: 1.46.6 Release: 0 License: GPLv2 Group: System Environment/Base diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot index d65b42d1f..2331e2641 100644 --- a/po/e2fsprogs.pot +++ b/po/e2fsprogs.pot @@ -1,7 +1,7 @@ # E2fsprogs translation template file # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, -# 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 by Theodore Ts'o +# 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022 by Theodore Ts'o # This file is distributed under the same license as the e2fsprogs package. # Theodore Ts'o <tytso@mit.edu>, 2021. # @@ -77,9 +77,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: e2fsprogs 1.46.5\n" +"Project-Id-Version: e2fsprogs 1.46.5.95\n" "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n" -"POT-Creation-Date: 2021-12-30 00:46-0500\n" +"POT-Creation-Date: 2022-09-12 08:19-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -102,12 +102,12 @@ msgstr "" msgid "while reading the bad blocks inode" msgstr "" -#: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1584 -#: e2fsck/unix.c:1698 misc/badblocks.c:1264 misc/badblocks.c:1272 -#: misc/badblocks.c:1286 misc/badblocks.c:1298 misc/dumpe2fs.c:437 -#: misc/dumpe2fs.c:702 misc/dumpe2fs.c:706 misc/e2image.c:1440 -#: misc/e2image.c:1638 misc/e2image.c:1659 misc/mke2fs.c:237 -#: misc/tune2fs.c:2887 misc/tune2fs.c:2987 resize/main.c:416 +#: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1592 +#: e2fsck/unix.c:1707 misc/badblocks.c:1266 misc/badblocks.c:1274 +#: misc/badblocks.c:1288 misc/badblocks.c:1300 misc/dumpe2fs.c:438 +#: misc/dumpe2fs.c:704 misc/dumpe2fs.c:708 misc/e2image.c:1440 +#: misc/e2image.c:1640 misc/e2image.c:1661 misc/mke2fs.c:237 +#: misc/tune2fs.c:2888 misc/tune2fs.c:2990 resize/main.c:422 #, c-format msgid "while trying to open %s" msgstr "" @@ -204,36 +204,36 @@ msgstr "" msgid "BLKFLSBUF ioctl not supported! Can't flush buffers.\n" msgstr "" -#: e2fsck/journal.c:1273 +#: e2fsck/journal.c:1289 msgid "reading journal superblock\n" msgstr "" -#: e2fsck/journal.c:1346 +#: e2fsck/journal.c:1362 #, c-format msgid "%s: no valid journal superblock found\n" msgstr "" -#: e2fsck/journal.c:1355 +#: e2fsck/journal.c:1371 #, c-format msgid "%s: journal too short\n" msgstr "" -#: e2fsck/journal.c:1368 +#: e2fsck/journal.c:1384 #, c-format msgid "%s: incorrect fast commit blocks\n" msgstr "" -#: e2fsck/journal.c:1670 misc/fuse2fs.c:3797 +#: e2fsck/journal.c:1686 misc/fuse2fs.c:3797 #, c-format msgid "%s: recovering journal\n" msgstr "" -#: e2fsck/journal.c:1672 +#: e2fsck/journal.c:1688 #, c-format msgid "%s: won't do journal recovery while read-only\n" msgstr "" -#: e2fsck/journal.c:1699 +#: e2fsck/journal.c:1715 #, c-format msgid "while trying to re-open %s" msgstr "" @@ -499,97 +499,97 @@ msgstr "" msgid "while hashing entry with e_value_inum = %u" msgstr "" -#: e2fsck/pass1.c:767 e2fsck/pass2.c:1153 +#: e2fsck/pass1.c:770 e2fsck/pass2.c:1155 msgid "reading directory block" msgstr "" -#: e2fsck/pass1.c:1166 +#: e2fsck/pass1.c:1169 msgid "getting next inode from scan" msgstr "" -#: e2fsck/pass1.c:1218 +#: e2fsck/pass1.c:1221 msgid "in-use inode map" msgstr "" -#: e2fsck/pass1.c:1229 +#: e2fsck/pass1.c:1232 msgid "directory inode map" msgstr "" -#: e2fsck/pass1.c:1239 +#: e2fsck/pass1.c:1242 msgid "regular file inode map" msgstr "" -#: e2fsck/pass1.c:1248 misc/e2image.c:1290 +#: e2fsck/pass1.c:1251 misc/e2image.c:1290 msgid "in-use block map" msgstr "" -#: e2fsck/pass1.c:1257 +#: e2fsck/pass1.c:1260 msgid "metadata block map" msgstr "" -#: e2fsck/pass1.c:1268 +#: e2fsck/pass1.c:1271 msgid "inode casefold map" msgstr "" -#: e2fsck/pass1.c:1333 +#: e2fsck/pass1.c:1336 msgid "opening inode scan" msgstr "" -#: e2fsck/pass1.c:2101 +#: e2fsck/pass1.c:2104 msgid "Pass 1" msgstr "" -#: e2fsck/pass1.c:2162 +#: e2fsck/pass1.c:2165 #, c-format msgid "reading indirect blocks of inode %u" msgstr "" -#: e2fsck/pass1.c:2213 +#: e2fsck/pass1.c:2216 msgid "bad inode map" msgstr "" -#: e2fsck/pass1.c:2253 +#: e2fsck/pass1.c:2256 msgid "inode in bad block map" msgstr "" -#: e2fsck/pass1.c:2273 +#: e2fsck/pass1.c:2276 msgid "imagic inode map" msgstr "" -#: e2fsck/pass1.c:2304 +#: e2fsck/pass1.c:2307 msgid "multiply claimed block map" msgstr "" -#: e2fsck/pass1.c:2429 +#: e2fsck/pass1.c:2432 msgid "ext attr block map" msgstr "" -#: e2fsck/pass1.c:3724 +#: e2fsck/pass1.c:3729 #, c-format msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n" msgstr "" -#: e2fsck/pass1.c:4145 +#: e2fsck/pass1.c:4150 msgid "block bitmap" msgstr "" -#: e2fsck/pass1.c:4151 +#: e2fsck/pass1.c:4156 msgid "inode bitmap" msgstr "" -#: e2fsck/pass1.c:4157 +#: e2fsck/pass1.c:4162 msgid "inode table" msgstr "" -#: e2fsck/pass2.c:317 +#: e2fsck/pass2.c:318 msgid "Pass 2" msgstr "" -#: e2fsck/pass2.c:574 +#: e2fsck/pass2.c:576 msgid "NLS is broken." msgstr "" -#: e2fsck/pass2.c:1226 e2fsck/pass2.c:1412 +#: e2fsck/pass2.c:1228 e2fsck/pass2.c:1414 msgid "Can not continue." msgstr "" @@ -605,7 +605,7 @@ msgstr "" msgid "Pass 3" msgstr "" -#: e2fsck/pass3.c:350 +#: e2fsck/pass3.c:355 msgid "inode loop detection bitmap" msgstr "" @@ -2595,8 +2595,8 @@ msgstr "" #: e2fsck/problem.c:1855 #, no-c-format -#. @-expanded: Unconnected directory inode %i (%p)\n -msgid "Unconnected @d @i %i (%p)\n" +#. @-expanded: Unconnected directory inode %i (was in %q)\n +msgid "Unconnected @d @i %i (was in %q)\n" msgstr "" #: e2fsck/problem.c:1860 @@ -2736,45 +2736,51 @@ msgstr "" msgid "/@l is encrypted\n" msgstr "" -#: e2fsck/problem.c:1996 -msgid "Pass 3A: Optimizing directories\n" +#: e2fsck/problem.c:1995 +#, no-c-format +#. @-expanded: Recursively looped directory inode %i (%p)\n +msgid "Recursively looped @d @i %i (%p)\n" msgstr "" #: e2fsck/problem.c:2002 +msgid "Pass 3A: Optimizing directories\n" +msgstr "" + +#: e2fsck/problem.c:2008 #, no-c-format msgid "Failed to create dirs_to_hash iterator: %m\n" msgstr "" -#: e2fsck/problem.c:2007 +#: e2fsck/problem.c:2013 msgid "Failed to optimize directory %q (%d): %m\n" msgstr "" -#: e2fsck/problem.c:2012 +#: e2fsck/problem.c:2018 msgid "Optimizing directories: " msgstr "" -#: e2fsck/problem.c:2029 +#: e2fsck/problem.c:2035 msgid "Pass 4: Checking reference counts\n" msgstr "" -#: e2fsck/problem.c:2035 +#: e2fsck/problem.c:2041 #, no-c-format #. @-expanded: unattached zero-length inode %i. msgid "@u @z @i %i. " msgstr "" -#: e2fsck/problem.c:2041 +#: e2fsck/problem.c:2047 #, no-c-format #. @-expanded: unattached inode %i\n msgid "@u @i %i\n" msgstr "" -#: e2fsck/problem.c:2046 +#: e2fsck/problem.c:2052 #. @-expanded: inode %i ref count is %Il, should be %N. msgid "@i %i ref count is %Il, @s %N. " msgstr "" -#: e2fsck/problem.c:2050 +#: e2fsck/problem.c:2056 #. @-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 @@ -2784,72 +2790,72 @@ msgid "" "@i_link_info[%i] is %N, @i.i_links_count is %Il. They @s the same!\n" msgstr "" -#: e2fsck/problem.c:2057 +#: e2fsck/problem.c:2063 #. @-expanded: extended attribute inode %i ref count is %N, should be %n. msgid "@a @i %i ref count is %N, @s %n. " msgstr "" -#: e2fsck/problem.c:2062 +#: e2fsck/problem.c:2068 #. @-expanded: directory exceeds max links, but no DIR_NLINK feature in superblock.\n msgid "@d exceeds max links, but no DIR_NLINK feature in @S.\n" msgstr "" -#: e2fsck/problem.c:2067 +#: e2fsck/problem.c:2073 #. @-expanded: directory inode %i ref count set to overflow but could be exact value %N. msgid "@d @i %i ref count set to overflow but could be exact value %N. " msgstr "" -#: e2fsck/problem.c:2074 +#: e2fsck/problem.c:2080 #. @-expanded: Pass 5: Checking group summary information\n msgid "Pass 5: Checking @g summary information\n" msgstr "" -#: e2fsck/problem.c:2079 +#: e2fsck/problem.c:2085 #. @-expanded: Padding at end of inode bitmap is not set. msgid "Padding at end of @i @B is not set. " msgstr "" -#: e2fsck/problem.c:2084 +#: e2fsck/problem.c:2090 #. @-expanded: Padding at end of block bitmap is not set. msgid "Padding at end of @b @B is not set. " msgstr "" -#: e2fsck/problem.c:2089 +#: e2fsck/problem.c:2095 #. @-expanded: block bitmap differences: msgid "@b @B differences: " msgstr "" -#: e2fsck/problem.c:2111 +#: e2fsck/problem.c:2117 #. @-expanded: inode bitmap differences: msgid "@i @B differences: " msgstr "" -#: e2fsck/problem.c:2133 +#: e2fsck/problem.c:2139 #. @-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:2138 +#: e2fsck/problem.c:2144 #. @-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:2143 +#: e2fsck/problem.c:2149 #. @-expanded: Free inodes count wrong (%i, counted=%j).\n msgid "Free @is count wrong (%i, counted=%j).\n" msgstr "" -#: e2fsck/problem.c:2148 +#: e2fsck/problem.c:2154 #. @-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:2153 +#: e2fsck/problem.c:2159 #. @-expanded: Free blocks count wrong (%b, counted=%c).\n msgid "Free @bs count wrong (%b, counted=%c).\n" msgstr "" -#: e2fsck/problem.c:2158 +#: e2fsck/problem.c:2164 #. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap #. @-expanded: endpoints (%i, %j)\n msgid "" @@ -2857,81 +2863,81 @@ msgid "" "endpoints (%i, %j)\n" msgstr "" -#: e2fsck/problem.c:2164 +#: e2fsck/problem.c:2170 msgid "Internal error: fudging end of bitmap (%N)\n" msgstr "" -#: e2fsck/problem.c:2170 +#: e2fsck/problem.c:2176 #, no-c-format #. @-expanded: Error copying in replacement inode bitmap: %m\n msgid "Error copying in replacement @i @B: %m\n" msgstr "" -#: e2fsck/problem.c:2176 +#: e2fsck/problem.c:2182 #, no-c-format #. @-expanded: Error copying in replacement block bitmap: %m\n msgid "Error copying in replacement @b @B: %m\n" msgstr "" -#: e2fsck/problem.c:2206 +#: e2fsck/problem.c:2212 #, no-c-format #. @-expanded: group %g block(s) in use but group is marked BLOCK_UNINIT\n msgid "@g %g @b(s) in use but @g is marked BLOCK_UNINIT\n" msgstr "" -#: e2fsck/problem.c:2212 +#: e2fsck/problem.c:2218 #, no-c-format #. @-expanded: group %g inode(s) in use but group is marked INODE_UNINIT\n msgid "@g %g @i(s) in use but @g is marked INODE_UNINIT\n" msgstr "" -#: e2fsck/problem.c:2218 +#: e2fsck/problem.c:2224 #, no-c-format #. @-expanded: group %g inode bitmap does not match checksum.\n msgid "@g %g @i @B does not match checksum.\n" msgstr "" -#: e2fsck/problem.c:2224 +#: e2fsck/problem.c:2230 #, no-c-format #. @-expanded: group %g block bitmap does not match checksum.\n msgid "@g %g @b @B does not match checksum.\n" msgstr "" -#: e2fsck/problem.c:2231 +#: e2fsck/problem.c:2237 #. @-expanded: Recreate journal msgid "Recreate @j" msgstr "" -#: e2fsck/problem.c:2236 +#: e2fsck/problem.c:2242 msgid "Update quota info for quota type %N" msgstr "" -#: e2fsck/problem.c:2242 +#: e2fsck/problem.c:2248 #, no-c-format #. @-expanded: Error setting block group checksum info: %m\n msgid "Error setting @b @g checksum info: %m\n" msgstr "" -#: e2fsck/problem.c:2248 +#: e2fsck/problem.c:2254 #, no-c-format msgid "Error writing file system info: %m\n" msgstr "" -#: e2fsck/problem.c:2254 +#: e2fsck/problem.c:2260 #, no-c-format msgid "Error flushing writes to storage device: %m\n" msgstr "" -#: e2fsck/problem.c:2259 +#: e2fsck/problem.c:2265 msgid "Error writing quota info for quota type %N: %m\n" msgstr "" -#: e2fsck/problem.c:2422 +#: e2fsck/problem.c:2430 #, c-format msgid "Unhandled error code (0x%x)!\n" msgstr "" -#: e2fsck/problem.c:2552 e2fsck/problem.c:2556 +#: e2fsck/problem.c:2558 e2fsck/problem.c:2562 msgid "IGNORED" msgstr "" @@ -2979,7 +2985,7 @@ msgstr "" msgid "Clearing" msgstr "" -#: e2fsck/unix.c:78 +#: e2fsck/unix.c:79 #, c-format msgid "" "Usage: %s [-panyrcdfktvDFV] [-b superblock] [-B blocksize]\n" @@ -2987,7 +2993,7 @@ msgid "" "\t\t[-E extended-options] [-z undo_file] device\n" msgstr "" -#: e2fsck/unix.c:83 +#: e2fsck/unix.c:84 msgid "" "\n" "Emergency help:\n" @@ -2999,7 +3005,7 @@ msgid "" " -f Force checking even if filesystem is marked clean\n" msgstr "" -#: e2fsck/unix.c:89 +#: e2fsck/unix.c:90 msgid "" " -v Be verbose\n" " -b superblock Use alternative superblock\n" @@ -3010,12 +3016,12 @@ msgid "" " -z undo_file Create an undo file\n" msgstr "" -#: e2fsck/unix.c:137 +#: e2fsck/unix.c:138 #, c-format msgid "%s: %u/%u files (%0d.%d%% non-contiguous), %llu/%llu blocks\n" msgstr "" -#: e2fsck/unix.c:164 +#: e2fsck/unix.c:165 #, c-format msgid "" "\n" @@ -3026,51 +3032,51 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:168 +#: e2fsck/unix.c:169 #, c-format msgid "%12u non-contiguous file (%0d.%d%%)\n" msgid_plural "%12u non-contiguous files (%0d.%d%%)\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:173 +#: e2fsck/unix.c:174 #, c-format msgid "%12u non-contiguous directory (%0d.%d%%)\n" msgid_plural "%12u non-contiguous directories (%0d.%d%%)\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:178 +#: e2fsck/unix.c:179 #, c-format msgid " # of inodes with ind/dind/tind blocks: %u/%u/%u\n" msgstr "" -#: e2fsck/unix.c:186 +#: e2fsck/unix.c:187 msgid " Extent depth histogram: " msgstr "" -#: e2fsck/unix.c:195 +#: e2fsck/unix.c:196 #, c-format msgid "%12llu block used (%2.2f%%, out of %llu)\n" msgid_plural "%12llu blocks used (%2.2f%%, out of %llu)\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:200 +#: e2fsck/unix.c:201 #, c-format msgid "%12u bad block\n" msgid_plural "%12u bad blocks\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:202 +#: e2fsck/unix.c:203 #, c-format msgid "%12u large file\n" msgid_plural "%12u large files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:204 +#: e2fsck/unix.c:205 #, c-format msgid "" "\n" @@ -3081,102 +3087,102 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:206 +#: e2fsck/unix.c:207 #, c-format msgid "%12u directory\n" msgid_plural "%12u directories\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:208 +#: e2fsck/unix.c:209 #, c-format msgid "%12u character device file\n" msgid_plural "%12u character device files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:211 +#: e2fsck/unix.c:212 #, c-format msgid "%12u block device file\n" msgid_plural "%12u block device files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:213 +#: e2fsck/unix.c:214 #, c-format msgid "%12u fifo\n" msgid_plural "%12u fifos\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:215 +#: e2fsck/unix.c:216 #, c-format msgid "%12u link\n" msgid_plural "%12u links\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:217 +#: e2fsck/unix.c:218 #, c-format msgid "%12u symbolic link" msgid_plural "%12u symbolic links" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:219 +#: e2fsck/unix.c:220 #, c-format msgid " (%u fast symbolic link)\n" msgid_plural " (%u fast symbolic links)\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:223 +#: e2fsck/unix.c:224 #, c-format msgid "%12u socket\n" msgid_plural "%12u sockets\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:227 +#: e2fsck/unix.c:228 #, c-format msgid "%12u file\n" msgid_plural "%12u files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:240 misc/badblocks.c:1001 misc/tune2fs.c:3079 misc/util.c:129 -#: resize/main.c:356 +#: e2fsck/unix.c:241 misc/badblocks.c:1001 misc/tune2fs.c:3082 misc/util.c:130 +#: resize/main.c:359 #, c-format msgid "while determining whether %s is mounted." msgstr "" -#: e2fsck/unix.c:261 +#: e2fsck/unix.c:262 #, c-format msgid "Warning! %s is mounted.\n" msgstr "" -#: e2fsck/unix.c:264 +#: e2fsck/unix.c:265 #, c-format msgid "Warning! %s is in use.\n" msgstr "" -#: e2fsck/unix.c:270 +#: e2fsck/unix.c:271 #, c-format msgid "%s is mounted.\n" msgstr "" -#: e2fsck/unix.c:272 +#: e2fsck/unix.c:273 #, c-format msgid "%s is in use.\n" msgstr "" -#: e2fsck/unix.c:274 +#: e2fsck/unix.c:275 msgid "" "Cannot continue, aborting.\n" "\n" msgstr "" -#: e2fsck/unix.c:276 +#: e2fsck/unix.c:277 msgid "" "\n" "\n" @@ -3185,85 +3191,85 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:281 +#: e2fsck/unix.c:282 msgid "Do you really want to continue" msgstr "" -#: e2fsck/unix.c:283 +#: e2fsck/unix.c:284 msgid "check aborted.\n" msgstr "" -#: e2fsck/unix.c:377 +#: e2fsck/unix.c:378 msgid " contains a file system with errors" msgstr "" -#: e2fsck/unix.c:379 +#: e2fsck/unix.c:380 msgid " was not cleanly unmounted" msgstr "" -#: e2fsck/unix.c:381 +#: e2fsck/unix.c:382 msgid " primary superblock features different from backup" msgstr "" -#: e2fsck/unix.c:385 +#: e2fsck/unix.c:386 #, c-format msgid " has been mounted %u times without being checked" msgstr "" -#: e2fsck/unix.c:392 +#: e2fsck/unix.c:393 msgid " has filesystem last checked time in the future" msgstr "" -#: e2fsck/unix.c:398 +#: e2fsck/unix.c:399 #, c-format msgid " has gone %u days without being checked" msgstr "" -#: e2fsck/unix.c:406 +#: e2fsck/unix.c:407 msgid "ignoring check interval, broken_system_clock set\n" msgstr "" -#: e2fsck/unix.c:412 +#: e2fsck/unix.c:413 msgid ", check forced.\n" msgstr "" -#: e2fsck/unix.c:445 +#: e2fsck/unix.c:446 #, c-format msgid "%s: clean, %u/%u files, %llu/%llu blocks" msgstr "" -#: e2fsck/unix.c:465 +#: e2fsck/unix.c:466 msgid " (check deferred; on battery)" msgstr "" -#: e2fsck/unix.c:468 +#: e2fsck/unix.c:469 msgid " (check after next mount)" msgstr "" -#: e2fsck/unix.c:470 +#: e2fsck/unix.c:471 #, c-format msgid " (check in %ld mounts)" msgstr "" -#: e2fsck/unix.c:620 +#: e2fsck/unix.c:621 #, c-format msgid "ERROR: Couldn't open /dev/null (%s)\n" msgstr "" -#: e2fsck/unix.c:691 +#: e2fsck/unix.c:692 msgid "Invalid EA version.\n" msgstr "" -#: e2fsck/unix.c:704 +#: e2fsck/unix.c:705 msgid "Invalid readahead buffer size.\n" msgstr "" -#: e2fsck/unix.c:767 +#: e2fsck/unix.c:768 #, c-format msgid "Unknown extended option: %s\n" msgstr "" -#: e2fsck/unix.c:775 +#: e2fsck/unix.c:776 msgid "" "\n" "Extended options are separated by commas, and may take an argument which\n" @@ -3271,87 +3277,87 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:779 +#: e2fsck/unix.c:780 msgid "\tea_ver=<ea_version (1 or 2)>\n" msgstr "" -#: e2fsck/unix.c:788 +#: e2fsck/unix.c:789 msgid "\treadahead_kb=<buffer size>\n" msgstr "" -#: e2fsck/unix.c:801 +#: e2fsck/unix.c:802 #, c-format msgid "" "Syntax error in e2fsck config file (%s, line #%d)\n" "\t%s\n" msgstr "" -#: e2fsck/unix.c:874 +#: e2fsck/unix.c:875 #, c-format msgid "Error validating file descriptor %d: %s\n" msgstr "" -#: e2fsck/unix.c:878 +#: e2fsck/unix.c:879 msgid "Invalid completion information file descriptor" msgstr "" -#: e2fsck/unix.c:893 +#: e2fsck/unix.c:894 msgid "Only one of the options -p/-a, -n or -y may be specified." msgstr "" -#: e2fsck/unix.c:914 +#: e2fsck/unix.c:915 #, c-format msgid "The -t option is not supported on this version of e2fsck.\n" msgstr "" -#: e2fsck/unix.c:946 e2fsck/unix.c:1024 misc/e2initrd_helper.c:330 -#: misc/tune2fs.c:1779 misc/tune2fs.c:2079 misc/tune2fs.c:2097 +#: e2fsck/unix.c:947 e2fsck/unix.c:1025 misc/e2initrd_helper.c:331 +#: misc/tune2fs.c:1780 misc/tune2fs.c:2080 misc/tune2fs.c:2098 #, c-format msgid "Unable to resolve '%s'" msgstr "" -#: e2fsck/unix.c:1003 +#: e2fsck/unix.c:1004 msgid "The -n and -D options are incompatible." msgstr "" -#: e2fsck/unix.c:1008 +#: e2fsck/unix.c:1009 msgid "The -n and -c options are incompatible." msgstr "" -#: e2fsck/unix.c:1013 +#: e2fsck/unix.c:1014 msgid "The -n and -l/-L options are incompatible." msgstr "" -#: e2fsck/unix.c:1037 +#: e2fsck/unix.c:1038 msgid "The -D and -E fixes_only options are incompatible." msgstr "" -#: e2fsck/unix.c:1043 +#: e2fsck/unix.c:1044 msgid "The -E bmap2extent and fixes_only options are incompatible." msgstr "" -#: e2fsck/unix.c:1094 +#: e2fsck/unix.c:1095 #, c-format msgid "while opening %s for flushing" msgstr "" -#: e2fsck/unix.c:1100 resize/main.c:385 +#: e2fsck/unix.c:1101 resize/main.c:391 #, c-format msgid "while trying to flush %s" msgstr "" -#: e2fsck/unix.c:1107 +#: e2fsck/unix.c:1108 msgid "The -c and the -l/-L options may not be both used at the same time.\n" msgstr "" -#: e2fsck/unix.c:1154 +#: e2fsck/unix.c:1155 #, c-format msgid "" "E2FSCK_JBD_DEBUG \"%s\" not an integer\n" "\n" msgstr "" -#: e2fsck/unix.c:1163 +#: e2fsck/unix.c:1164 #, c-format msgid "" "\n" @@ -3359,31 +3365,31 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:1254 +#: e2fsck/unix.c:1262 #, c-format msgid "" "MMP interval is %u seconds and total wait time is %u seconds. Please " "wait...\n" msgstr "" -#: e2fsck/unix.c:1271 e2fsck/unix.c:1276 +#: e2fsck/unix.c:1279 e2fsck/unix.c:1284 msgid "while checking MMP block" msgstr "" -#: e2fsck/unix.c:1278 +#: e2fsck/unix.c:1286 #, c-format msgid "" "If you are sure the filesystem is not in use on any node, run:\n" "'tune2fs -f -E clear_mmp %s'\n" msgstr "" -#: e2fsck/unix.c:1294 +#: e2fsck/unix.c:1302 msgid "while reading MMP block" msgstr "" -#: e2fsck/unix.c:1314 e2fsck/unix.c:1366 misc/e2undo.c:240 misc/e2undo.c:285 -#: misc/mke2fs.c:2758 misc/mke2fs.c:2809 misc/tune2fs.c:2804 -#: misc/tune2fs.c:2849 resize/main.c:188 resize/main.c:233 +#: e2fsck/unix.c:1322 e2fsck/unix.c:1374 misc/e2undo.c:240 misc/e2undo.c:285 +#: misc/mke2fs.c:2758 misc/mke2fs.c:2809 misc/tune2fs.c:2805 +#: misc/tune2fs.c:2850 resize/main.c:188 resize/main.c:233 #, c-format msgid "" "Overwriting existing filesystem; this can be undone using the command:\n" @@ -3391,210 +3397,210 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:1355 misc/e2undo.c:274 misc/mke2fs.c:2798 misc/tune2fs.c:2838 +#: e2fsck/unix.c:1363 misc/e2undo.c:274 misc/mke2fs.c:2798 misc/tune2fs.c:2839 #: resize/main.c:222 #, c-format msgid "while trying to delete %s" msgstr "" -#: e2fsck/unix.c:1381 misc/mke2fs.c:2824 resize/main.c:243 +#: e2fsck/unix.c:1389 misc/mke2fs.c:2824 resize/main.c:243 msgid "while trying to setup undo file\n" msgstr "" -#: e2fsck/unix.c:1425 +#: e2fsck/unix.c:1433 msgid "Error: ext2fs library version out of date!\n" msgstr "" -#: e2fsck/unix.c:1432 +#: e2fsck/unix.c:1440 msgid "while trying to initialize program" msgstr "" -#: e2fsck/unix.c:1469 +#: e2fsck/unix.c:1477 #, c-format msgid "\tUsing %s, %s\n" msgstr "" -#: e2fsck/unix.c:1481 +#: e2fsck/unix.c:1489 msgid "need terminal for interactive repairs" msgstr "" -#: e2fsck/unix.c:1542 +#: e2fsck/unix.c:1550 #, c-format msgid "%s: %s trying backup blocks...\n" msgstr "" -#: e2fsck/unix.c:1544 +#: e2fsck/unix.c:1552 msgid "Superblock invalid," msgstr "" -#: e2fsck/unix.c:1545 +#: e2fsck/unix.c:1553 msgid "Group descriptors look bad..." msgstr "" -#: e2fsck/unix.c:1555 +#: e2fsck/unix.c:1563 #, c-format msgid "%s: %s while using the backup blocks" msgstr "" -#: e2fsck/unix.c:1559 +#: e2fsck/unix.c:1567 #, c-format msgid "%s: going back to original superblock\n" msgstr "" -#: e2fsck/unix.c:1588 +#: e2fsck/unix.c:1596 msgid "" "The filesystem revision is apparently too high for this version of e2fsck.\n" "(Or the filesystem superblock is corrupt)\n" "\n" msgstr "" -#: e2fsck/unix.c:1595 +#: e2fsck/unix.c:1603 msgid "Could this be a zero-length partition?\n" msgstr "" -#: e2fsck/unix.c:1597 +#: e2fsck/unix.c:1605 #, c-format msgid "You must have %s access to the filesystem or be root\n" msgstr "" -#: e2fsck/unix.c:1603 +#: e2fsck/unix.c:1611 msgid "Possibly non-existent or swap device?\n" msgstr "" -#: e2fsck/unix.c:1605 +#: e2fsck/unix.c:1613 msgid "Filesystem mounted or opened exclusively by another program?\n" msgstr "" -#: e2fsck/unix.c:1609 +#: e2fsck/unix.c:1617 msgid "Possibly non-existent device?\n" msgstr "" -#: e2fsck/unix.c:1612 +#: e2fsck/unix.c:1620 msgid "" "Disk write-protected; use the -n option to do a read-only\n" "check of the device.\n" msgstr "" -#: e2fsck/unix.c:1626 +#: e2fsck/unix.c:1635 #, c-format msgid "%s: Trying to load superblock despite errors...\n" msgstr "" -#: e2fsck/unix.c:1701 +#: e2fsck/unix.c:1710 msgid "Get a newer version of e2fsck!" msgstr "" -#: e2fsck/unix.c:1761 +#: e2fsck/unix.c:1770 #, c-format msgid "while checking journal for %s" msgstr "" -#: e2fsck/unix.c:1764 +#: e2fsck/unix.c:1773 msgid "Cannot proceed with file system check" msgstr "" -#: e2fsck/unix.c:1775 +#: e2fsck/unix.c:1784 msgid "" "Warning: skipping journal recovery because doing a read-only filesystem " "check.\n" msgstr "" -#: e2fsck/unix.c:1787 +#: e2fsck/unix.c:1796 #, c-format msgid "unable to set superblock flags on %s\n" msgstr "" -#: e2fsck/unix.c:1793 +#: e2fsck/unix.c:1802 #, c-format msgid "Journal checksum error found in %s\n" msgstr "" -#: e2fsck/unix.c:1797 +#: e2fsck/unix.c:1806 #, c-format msgid "Journal corrupted in %s\n" msgstr "" -#: e2fsck/unix.c:1801 +#: e2fsck/unix.c:1810 #, c-format msgid "while recovering journal of %s" msgstr "" -#: e2fsck/unix.c:1823 +#: e2fsck/unix.c:1832 #, c-format msgid "%s has unsupported feature(s):" msgstr "" -#: e2fsck/unix.c:1838 +#: e2fsck/unix.c:1847 #, c-format msgid "%s has unsupported encoding: %0x\n" msgstr "" -#: e2fsck/unix.c:1888 +#: e2fsck/unix.c:1897 #, c-format msgid "%s: %s while reading bad blocks inode\n" msgstr "" -#: e2fsck/unix.c:1891 +#: e2fsck/unix.c:1900 msgid "This doesn't bode well, but we'll try to go on...\n" msgstr "" -#: e2fsck/unix.c:1934 +#: e2fsck/unix.c:1943 #, c-format msgid "Creating journal (%d blocks): " msgstr "" -#: e2fsck/unix.c:1943 +#: e2fsck/unix.c:1952 msgid " Done.\n" msgstr "" -#: e2fsck/unix.c:1945 +#: e2fsck/unix.c:1954 msgid "" "\n" "*** journal has been regenerated ***\n" msgstr "" -#: e2fsck/unix.c:1951 +#: e2fsck/unix.c:1960 msgid "aborted" msgstr "" -#: e2fsck/unix.c:1953 +#: e2fsck/unix.c:1962 #, c-format msgid "%s: e2fsck canceled.\n" msgstr "" -#: e2fsck/unix.c:1980 +#: e2fsck/unix.c:1989 msgid "Restarting e2fsck from the beginning...\n" msgstr "" -#: e2fsck/unix.c:1984 +#: e2fsck/unix.c:1993 msgid "while resetting context" msgstr "" -#: e2fsck/unix.c:2043 +#: e2fsck/unix.c:2052 #, c-format msgid "" "\n" "%s: ***** FILE SYSTEM ERRORS CORRECTED *****\n" msgstr "" -#: e2fsck/unix.c:2045 +#: e2fsck/unix.c:2054 #, c-format msgid "%s: File system was modified.\n" msgstr "" -#: e2fsck/unix.c:2049 e2fsck/util.c:67 +#: e2fsck/unix.c:2058 e2fsck/util.c:67 #, c-format msgid "" "\n" "%s: ***** FILE SYSTEM WAS MODIFIED *****\n" msgstr "" -#: e2fsck/unix.c:2054 +#: e2fsck/unix.c:2063 #, c-format msgid "%s: ***** REBOOT SYSTEM *****\n" msgstr "" -#: e2fsck/unix.c:2064 e2fsck/util.c:73 +#: e2fsck/unix.c:2073 e2fsck/util.c:73 #, c-format msgid "" "\n" @@ -3602,11 +3608,11 @@ msgid "" "\n" msgstr "" -#: e2fsck/util.c:191 misc/util.c:93 +#: e2fsck/util.c:191 misc/util.c:94 msgid "yY" msgstr "" -#: e2fsck/util.c:192 misc/util.c:112 +#: e2fsck/util.c:192 misc/util.c:113 msgid "nN" msgstr "" @@ -3700,37 +3706,37 @@ msgid "" "\t(i.e., without -a or -p options)\n" msgstr "" -#: e2fsck/util.c:438 +#: e2fsck/util.c:437 e2fsck/util.c:447 #, c-format msgid "Memory used: %lluk/%lluk (%lluk/%lluk), " msgstr "" -#: e2fsck/util.c:444 +#: e2fsck/util.c:453 #, c-format msgid "Memory used: %lluk, " msgstr "" -#: e2fsck/util.c:450 +#: e2fsck/util.c:459 #, c-format msgid "time: %5.2f/%5.2f/%5.2f\n" msgstr "" -#: e2fsck/util.c:455 +#: e2fsck/util.c:464 #, c-format msgid "elapsed time: %6.3f\n" msgstr "" -#: e2fsck/util.c:490 e2fsck/util.c:504 +#: e2fsck/util.c:499 e2fsck/util.c:513 #, c-format msgid "while reading inode %lu in %s" msgstr "" -#: e2fsck/util.c:518 e2fsck/util.c:531 +#: e2fsck/util.c:527 e2fsck/util.c:540 #, c-format msgid "while writing inode %lu in %s" msgstr "" -#: e2fsck/util.c:790 +#: e2fsck/util.c:799 msgid "" "UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is " "running.\n" @@ -3841,7 +3847,7 @@ msgstr "" msgid "during test data write, block %lu" msgstr "" -#: misc/badblocks.c:1006 misc/util.c:134 +#: misc/badblocks.c:1006 misc/util.c:135 #, c-format msgid "%s is mounted; " msgstr "" @@ -3854,7 +3860,7 @@ msgstr "" msgid "it's not safe to run badblocks!\n" msgstr "" -#: misc/badblocks.c:1018 misc/util.c:145 +#: misc/badblocks.c:1018 misc/util.c:146 #, c-format msgid "%s is apparently in use by the system; " msgstr "" @@ -3868,82 +3874,83 @@ msgstr "" msgid "invalid %s - %s" msgstr "" -#: misc/badblocks.c:1135 +#: misc/badblocks.c:1137 #, c-format msgid "Too big max bad blocks count %u - maximum is %u" msgstr "" -#: misc/badblocks.c:1162 +#: misc/badblocks.c:1164 #, c-format msgid "can't allocate memory for test_pattern - %s" msgstr "" -#: misc/badblocks.c:1192 +#: misc/badblocks.c:1194 msgid "Maximum of one test_pattern may be specified in read-only mode" msgstr "" -#: misc/badblocks.c:1198 +#: misc/badblocks.c:1200 msgid "Random test_pattern is not allowed in read-only mode" msgstr "" -#: misc/badblocks.c:1205 +#: misc/badblocks.c:1207 #, c-format msgid "Invalid block size: %d\n" msgstr "" -#: misc/badblocks.c:1211 +#: misc/badblocks.c:1213 #, c-format msgid "Invalid blocks_at_once: %d\n" msgstr "" -#: misc/badblocks.c:1225 +#: misc/badblocks.c:1227 msgid "" "Couldn't determine device size; you must specify\n" "the size manually\n" msgstr "" -#: misc/badblocks.c:1231 +#: misc/badblocks.c:1233 msgid "while trying to determine device size" msgstr "" -#: misc/badblocks.c:1236 +#: misc/badblocks.c:1238 msgid "last block" msgstr "" -#: misc/badblocks.c:1242 +#: misc/badblocks.c:1244 msgid "first block" msgstr "" -#: misc/badblocks.c:1245 +#: misc/badblocks.c:1247 #, c-format msgid "invalid starting block (%llu): must be less than %llu" msgstr "" -#: misc/badblocks.c:1253 +#: misc/badblocks.c:1255 #, c-format msgid "invalid end block (%llu): must be 32-bit value" msgstr "" -#: misc/badblocks.c:1309 +#: misc/badblocks.c:1311 msgid "while creating in-memory bad blocks list" msgstr "" -#: misc/badblocks.c:1318 +#: misc/badblocks.c:1320 msgid "input file - bad format" msgstr "" -#: misc/badblocks.c:1326 misc/badblocks.c:1335 +#: misc/badblocks.c:1328 misc/badblocks.c:1337 msgid "while adding to in-memory bad block list" msgstr "" -#: misc/badblocks.c:1360 +#: misc/badblocks.c:1362 #, c-format msgid "Pass completed, %u bad blocks found. (%d/%d/%d errors)\n" msgstr "" #: misc/chattr.c:89 #, c-format -msgid "Usage: %s [-pRVf] [-+=aAcCdDeijPsStTuFx] [-v version] files...\n" +msgid "" +"Usage: %s [-RVf] [-+=aAcCdDeijPsStTuFx] [-p project] [-v version] files...\n" msgstr "" #: misc/chattr.c:162 @@ -4278,59 +4285,59 @@ msgstr "" msgid "while printing bad block list" msgstr "" -#: misc/dumpe2fs.c:346 +#: misc/dumpe2fs.c:347 #, c-format msgid "Bad blocks: %u" msgstr "" -#: misc/dumpe2fs.c:374 misc/tune2fs.c:378 +#: misc/dumpe2fs.c:375 misc/tune2fs.c:379 msgid "while reading journal inode" msgstr "" -#: misc/dumpe2fs.c:380 +#: misc/dumpe2fs.c:381 msgid "while opening journal inode" msgstr "" -#: misc/dumpe2fs.c:386 +#: misc/dumpe2fs.c:387 msgid "while reading journal super block" msgstr "" -#: misc/dumpe2fs.c:393 +#: misc/dumpe2fs.c:394 msgid "Journal superblock magic number invalid!\n" msgstr "" -#: misc/dumpe2fs.c:413 misc/tune2fs.c:221 +#: misc/dumpe2fs.c:414 misc/tune2fs.c:222 msgid "while reading journal superblock" msgstr "" -#: misc/dumpe2fs.c:421 +#: misc/dumpe2fs.c:422 msgid "Couldn't find journal superblock magic numbers" msgstr "" -#: misc/dumpe2fs.c:476 +#: misc/dumpe2fs.c:477 msgid "failed to alloc MMP buffer\n" msgstr "" -#: misc/dumpe2fs.c:487 +#: misc/dumpe2fs.c:488 #, c-format msgid "reading MMP block %llu from '%s'\n" msgstr "" -#: misc/dumpe2fs.c:519 misc/mke2fs.c:811 misc/tune2fs.c:2119 +#: misc/dumpe2fs.c:520 misc/mke2fs.c:811 misc/tune2fs.c:2120 msgid "Couldn't allocate memory to parse options!\n" msgstr "" -#: misc/dumpe2fs.c:545 +#: misc/dumpe2fs.c:546 #, c-format msgid "Invalid superblock parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:560 +#: misc/dumpe2fs.c:561 #, c-format msgid "Invalid blocksize parameter: %s\n" msgstr "" -#: misc/dumpe2fs.c:571 +#: misc/dumpe2fs.c:572 #, c-format msgid "" "\n" @@ -4344,27 +4351,27 @@ msgid "" "\tblocksize=<blocksize>\n" msgstr "" -#: misc/dumpe2fs.c:661 misc/mke2fs.c:1911 +#: misc/dumpe2fs.c:663 misc/mke2fs.c:1911 #, c-format msgid "\tUsing %s\n" msgstr "" -#: misc/dumpe2fs.c:708 misc/e2image.c:1640 misc/tune2fs.c:3005 -#: resize/main.c:418 +#: misc/dumpe2fs.c:710 misc/e2image.c:1642 misc/tune2fs.c:3008 +#: resize/main.c:424 msgid "Couldn't find valid filesystem superblock.\n" msgstr "" -#: misc/dumpe2fs.c:730 +#: misc/dumpe2fs.c:732 #, c-format msgid "%s: MMP feature not enabled.\n" msgstr "" -#: misc/dumpe2fs.c:761 +#: misc/dumpe2fs.c:763 #, c-format msgid "while trying to read '%s' bitmaps\n" msgstr "" -#: misc/dumpe2fs.c:770 +#: misc/dumpe2fs.c:772 msgid "" "*** Run e2fsck now!\n" "\n" @@ -4542,31 +4549,31 @@ msgstr "" msgid "while restoring the image table" msgstr "" -#: misc/e2image.c:1576 +#: misc/e2image.c:1578 msgid "-a option can only be used with raw or QCOW2 images." msgstr "" -#: misc/e2image.c:1581 +#: misc/e2image.c:1583 msgid "-b option can only be used with raw or QCOW2 images." msgstr "" -#: misc/e2image.c:1587 +#: misc/e2image.c:1589 msgid "Offsets are only allowed with raw images." msgstr "" -#: misc/e2image.c:1592 +#: misc/e2image.c:1594 msgid "Move mode is only allowed with raw images." msgstr "" -#: misc/e2image.c:1597 +#: misc/e2image.c:1599 msgid "Move mode requires all data mode." msgstr "" -#: misc/e2image.c:1607 +#: misc/e2image.c:1609 msgid "checking if mounted" msgstr "" -#: misc/e2image.c:1614 +#: misc/e2image.c:1616 msgid "" "\n" "Running e2image on a R/W mounted filesystem can result in an\n" @@ -4574,56 +4581,56 @@ msgid "" "Use -f option if you really want to do that.\n" msgstr "" -#: misc/e2image.c:1668 +#: misc/e2image.c:1670 msgid "QCOW2 image can not be written to the stdout!\n" msgstr "" -#: misc/e2image.c:1674 +#: misc/e2image.c:1676 msgid "Can not stat output\n" msgstr "" -#: misc/e2image.c:1684 +#: misc/e2image.c:1686 #, c-format msgid "Image (%s) is compressed\n" msgstr "" -#: misc/e2image.c:1687 +#: misc/e2image.c:1689 #, c-format msgid "Image (%s) is encrypted\n" msgstr "" -#: misc/e2image.c:1690 +#: misc/e2image.c:1692 #, c-format msgid "Image (%s) is corrupted\n" msgstr "" -#: misc/e2image.c:1694 +#: misc/e2image.c:1696 #, c-format msgid "while trying to convert qcow2 image (%s) into raw image (%s)" msgstr "" -#: misc/e2image.c:1704 +#: misc/e2image.c:1706 msgid "The -c option only supported in raw mode\n" msgstr "" -#: misc/e2image.c:1709 +#: misc/e2image.c:1711 msgid "The -c option not supported when writing to stdout\n" msgstr "" -#: misc/e2image.c:1716 +#: misc/e2image.c:1718 msgid "while allocating check_buf" msgstr "" -#: misc/e2image.c:1722 +#: misc/e2image.c:1724 msgid "The -p option only supported in raw mode\n" msgstr "" -#: misc/e2image.c:1732 +#: misc/e2image.c:1734 #, c-format msgid "%d blocks already contained the data to be copied\n" msgstr "" -#: misc/e2initrd_helper.c:68 +#: misc/e2initrd_helper.c:69 #, c-format msgid "Usage: %s -r device\n" msgstr "" @@ -4648,7 +4655,7 @@ msgstr "" msgid "e2label: not an ext2 filesystem\n" msgstr "" -#: misc/e2label.c:97 misc/tune2fs.c:3214 +#: misc/e2label.c:97 misc/tune2fs.c:3215 #, c-format msgid "Warning: label too long, truncating.\n" msgstr "" @@ -4663,7 +4670,7 @@ msgstr "" msgid "e2label: error writing superblock\n" msgstr "" -#: misc/e2label.c:117 misc/tune2fs.c:1771 +#: misc/e2label.c:117 misc/tune2fs.c:1772 #, c-format msgid "Usage: e2label device [newlabel]\n" msgstr "" @@ -4875,17 +4882,17 @@ msgid "" "%11Lu: finished with errno %d\n" msgstr "" -#: misc/fsck.c:343 +#: misc/fsck.c:344 #, c-format msgid "WARNING: couldn't open %s: %s\n" msgstr "" -#: misc/fsck.c:353 +#: misc/fsck.c:354 #, c-format msgid "WARNING: bad format on line %d of %s\n" msgstr "" -#: misc/fsck.c:370 +#: misc/fsck.c:371 msgid "" "WARNING: Your /etc/fstab does not contain the fsck passno\n" "\tfield. I will kludge around things for you, but you\n" @@ -4893,78 +4900,78 @@ msgid "" "\n" msgstr "" -#: misc/fsck.c:485 +#: misc/fsck.c:486 #, c-format msgid "fsck: %s: not found\n" msgstr "" -#: misc/fsck.c:601 +#: misc/fsck.c:602 #, c-format msgid "%s: wait: No more child process?!?\n" msgstr "" -#: misc/fsck.c:623 +#: misc/fsck.c:624 #, c-format msgid "Warning... %s for device %s exited with signal %d.\n" msgstr "" -#: misc/fsck.c:629 +#: misc/fsck.c:630 #, c-format msgid "%s %s: status is %x, should never happen.\n" msgstr "" -#: misc/fsck.c:668 +#: misc/fsck.c:669 #, c-format msgid "Finished with %s (exit status %d)\n" msgstr "" -#: misc/fsck.c:728 +#: misc/fsck.c:729 #, c-format msgid "%s: Error %d while executing fsck.%s for %s\n" msgstr "" -#: misc/fsck.c:749 +#: misc/fsck.c:750 msgid "" "Either all or none of the filesystem types passed to -t must be prefixed\n" "with 'no' or '!'.\n" msgstr "" -#: misc/fsck.c:768 +#: misc/fsck.c:769 msgid "Couldn't allocate memory for filesystem types\n" msgstr "" -#: misc/fsck.c:891 +#: misc/fsck.c:892 #, c-format msgid "" "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass " "number\n" msgstr "" -#: misc/fsck.c:918 +#: misc/fsck.c:919 #, c-format msgid "fsck: cannot check %s: fsck.%s not found\n" msgstr "" -#: misc/fsck.c:974 +#: misc/fsck.c:975 msgid "Checking all file systems.\n" msgstr "" -#: misc/fsck.c:1065 +#: misc/fsck.c:1066 #, c-format msgid "--waiting-- (pass %d)\n" msgstr "" -#: misc/fsck.c:1085 +#: misc/fsck.c:1086 msgid "" "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n" msgstr "" -#: misc/fsck.c:1127 +#: misc/fsck.c:1128 #, c-format msgid "%s: too many devices\n" msgstr "" -#: misc/fsck.c:1160 misc/fsck.c:1246 +#: misc/fsck.c:1161 misc/fsck.c:1247 #, c-format msgid "%s: too many arguments\n" msgstr "" @@ -4983,7 +4990,7 @@ msgstr "" msgid "%s: %s.\n" msgstr "" -#: misc/fuse2fs.c:3783 misc/fuse2fs.c:3802 misc/tune2fs.c:3105 +#: misc/fuse2fs.c:3783 misc/fuse2fs.c:3802 misc/tune2fs.c:3108 #, c-format msgid "Please run e2fsck -fy %s.\n" msgstr "" @@ -5309,7 +5316,7 @@ msgstr "" msgid "Invalid offset: %s\n" msgstr "" -#: misc/mke2fs.c:892 misc/tune2fs.c:2147 +#: misc/mke2fs.c:892 misc/tune2fs.c:2148 #, c-format msgid "Invalid mmp_update_interval: %s\n" msgstr "" @@ -5389,12 +5396,12 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:1136 misc/tune2fs.c:2283 +#: misc/mke2fs.c:1136 misc/tune2fs.c:2284 #, c-format msgid "error: Invalid encoding flag: %s\n" msgstr "" -#: misc/mke2fs.c:1142 misc/tune2fs.c:2292 +#: misc/mke2fs.c:1142 misc/tune2fs.c:2293 #, c-format msgid "" "error: An encoding must be explicitly specified when passing encoding-flags\n" @@ -5407,12 +5414,12 @@ msgid "" "\t%s\n" msgstr "" -#: misc/mke2fs.c:1205 misc/tune2fs.c:1107 +#: misc/mke2fs.c:1205 misc/tune2fs.c:1108 #, c-format msgid "Invalid filesystem option set: %s\n" msgstr "" -#: misc/mke2fs.c:1217 misc/tune2fs.c:424 +#: misc/mke2fs.c:1217 misc/tune2fs.c:425 #, c-format msgid "Invalid mount option set: %s\n" msgstr "" @@ -5470,7 +5477,7 @@ msgstr "" msgid "'-R' is deprecated, use '-E' instead" msgstr "" -#: misc/mke2fs.c:1708 misc/tune2fs.c:1873 +#: misc/mke2fs.c:1708 misc/tune2fs.c:1874 #, c-format msgid "bad error behavior - %s" msgstr "" @@ -5589,7 +5596,7 @@ msgstr "" msgid "Creating regular file %s\n" msgstr "" -#: misc/mke2fs.c:2011 resize/main.c:506 +#: misc/mke2fs.c:2011 resize/main.c:512 msgid "while trying to determine filesystem size" msgstr "" @@ -5917,7 +5924,7 @@ msgstr "" msgid "while reserving blocks for online resize" msgstr "" -#: misc/mke2fs.c:3394 misc/tune2fs.c:1569 +#: misc/mke2fs.c:3394 misc/tune2fs.c:1570 msgid "journal" msgstr "" @@ -5934,7 +5941,7 @@ msgid "" msgstr "" #: misc/mke2fs.c:3418 misc/mke2fs.c:3448 misc/mke2fs.c:3490 -#: misc/mk_hugefiles.c:602 misc/tune2fs.c:1598 misc/tune2fs.c:1620 +#: misc/mk_hugefiles.c:602 misc/tune2fs.c:1599 misc/tune2fs.c:1621 msgid "done\n" msgstr "" @@ -5953,7 +5960,7 @@ msgid "" "\twhile trying to create journal" msgstr "" -#: misc/mke2fs.c:3456 misc/tune2fs.c:1172 +#: misc/mke2fs.c:3456 misc/tune2fs.c:1173 msgid "" "\n" "Error while enabling multiple mount protection feature." @@ -6050,21 +6057,21 @@ msgstr "" msgid "%s: h=%3d s=%3d c=%4d start=%8d size=%8lu end=%8d\n" msgstr "" -#: misc/tune2fs.c:120 +#: misc/tune2fs.c:121 msgid "" "\n" "This operation requires a freshly checked filesystem.\n" msgstr "" -#: misc/tune2fs.c:122 +#: misc/tune2fs.c:123 msgid "Please run e2fsck -f on the filesystem.\n" msgstr "" -#: misc/tune2fs.c:124 +#: misc/tune2fs.c:125 msgid "Please run e2fsck -fD on the filesystem.\n" msgstr "" -#: misc/tune2fs.c:137 +#: misc/tune2fs.c:138 #, c-format msgid "" "Usage: %s [-c max_mounts_count] [-e errors_behavior] [-f] [-g group]\n" @@ -6077,304 +6084,304 @@ msgid "" "\t[-I new_inode_size] [-z undo_file] device\n" msgstr "" -#: misc/tune2fs.c:228 +#: misc/tune2fs.c:229 msgid "Journal superblock not found!\n" msgstr "" -#: misc/tune2fs.c:286 +#: misc/tune2fs.c:287 msgid "while trying to open external journal" msgstr "" -#: misc/tune2fs.c:292 misc/tune2fs.c:2895 +#: misc/tune2fs.c:293 misc/tune2fs.c:2896 #, c-format msgid "%s is not a journal device.\n" msgstr "" -#: misc/tune2fs.c:301 misc/tune2fs.c:2904 +#: misc/tune2fs.c:302 misc/tune2fs.c:2905 #, c-format msgid "" "Journal superblock is corrupted, nr_users\n" "is too high (%d).\n" msgstr "" -#: misc/tune2fs.c:308 misc/tune2fs.c:2911 +#: misc/tune2fs.c:309 misc/tune2fs.c:2912 msgid "Filesystem's UUID not found on journal device.\n" msgstr "" -#: misc/tune2fs.c:332 +#: misc/tune2fs.c:333 msgid "" "Cannot locate journal device. It was NOT removed\n" "Use -f option to remove missing journal device.\n" msgstr "" -#: misc/tune2fs.c:341 +#: misc/tune2fs.c:342 msgid "Journal removed\n" msgstr "" -#: misc/tune2fs.c:385 +#: misc/tune2fs.c:386 msgid "while reading bitmaps" msgstr "" -#: misc/tune2fs.c:393 +#: misc/tune2fs.c:394 msgid "while clearing journal inode" msgstr "" -#: misc/tune2fs.c:406 +#: misc/tune2fs.c:407 msgid "while writing journal inode" msgstr "" -#: misc/tune2fs.c:442 misc/tune2fs.c:467 misc/tune2fs.c:480 +#: misc/tune2fs.c:443 misc/tune2fs.c:468 misc/tune2fs.c:481 msgid "(and reboot afterwards!)\n" msgstr "" -#: misc/tune2fs.c:495 +#: misc/tune2fs.c:496 #, c-format msgid "After running e2fsck, please run `resize2fs %s %s" msgstr "" -#: misc/tune2fs.c:498 +#: misc/tune2fs.c:499 #, c-format msgid "Please run `resize2fs %s %s" msgstr "" -#: misc/tune2fs.c:502 +#: misc/tune2fs.c:503 #, c-format msgid " -z \"%s\"" msgstr "" -#: misc/tune2fs.c:504 +#: misc/tune2fs.c:505 #, c-format msgid "' to enable 64-bit mode.\n" msgstr "" -#: misc/tune2fs.c:506 +#: misc/tune2fs.c:507 #, c-format msgid "' to disable 64-bit mode.\n" msgstr "" -#: misc/tune2fs.c:1074 +#: misc/tune2fs.c:1075 msgid "" "WARNING: Could not confirm kernel support for metadata_csum_seed.\n" " This requires Linux >= v4.4.\n" msgstr "" -#: misc/tune2fs.c:1110 +#: misc/tune2fs.c:1111 #, c-format msgid "Clearing filesystem feature '%s' not supported.\n" msgstr "" -#: misc/tune2fs.c:1116 +#: misc/tune2fs.c:1117 #, c-format msgid "Setting filesystem feature '%s' not supported.\n" msgstr "" -#: misc/tune2fs.c:1125 +#: misc/tune2fs.c:1126 msgid "" "The has_journal feature may only be cleared when the filesystem is\n" "unmounted or mounted read-only.\n" msgstr "" -#: misc/tune2fs.c:1133 +#: misc/tune2fs.c:1134 msgid "" "The needs_recovery flag is set. Please run e2fsck before clearing\n" "the has_journal flag.\n" msgstr "" -#: misc/tune2fs.c:1151 +#: misc/tune2fs.c:1152 msgid "" "Setting filesystem feature 'sparse_super' not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1164 +#: misc/tune2fs.c:1165 msgid "" "The multiple mount protection feature can't\n" "be set if the filesystem is mounted or\n" "read-only.\n" msgstr "" -#: misc/tune2fs.c:1182 +#: misc/tune2fs.c:1183 #, c-format msgid "Multiple mount protection has been enabled with update interval %ds.\n" msgstr "" -#: misc/tune2fs.c:1191 +#: misc/tune2fs.c:1192 msgid "" "The multiple mount protection feature cannot\n" "be disabled if the filesystem is readonly.\n" msgstr "" -#: misc/tune2fs.c:1199 +#: misc/tune2fs.c:1200 msgid "Error while reading bitmaps\n" msgstr "" -#: misc/tune2fs.c:1208 +#: misc/tune2fs.c:1209 #, c-format msgid "Magic number in MMP block does not match. expected: %x, actual: %x\n" msgstr "" -#: misc/tune2fs.c:1213 +#: misc/tune2fs.c:1214 msgid "while reading MMP block." msgstr "" -#: misc/tune2fs.c:1246 +#: misc/tune2fs.c:1247 msgid "" "Disabling directory index on filesystem with checksums could take some time." msgstr "" -#: misc/tune2fs.c:1250 +#: misc/tune2fs.c:1251 msgid "Cannot disable dir_index on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1263 +#: misc/tune2fs.c:1264 msgid "" "Clearing the flex_bg flag would cause the the filesystem to be\n" "inconsistent.\n" msgstr "" -#: misc/tune2fs.c:1274 +#: misc/tune2fs.c:1275 msgid "" "The huge_file feature may only be cleared when the filesystem is\n" "unmounted or mounted read-only.\n" msgstr "" -#: misc/tune2fs.c:1285 +#: misc/tune2fs.c:1286 msgid "Enabling checksums could take some time." msgstr "" -#: misc/tune2fs.c:1288 +#: misc/tune2fs.c:1289 msgid "Cannot enable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1294 +#: misc/tune2fs.c:1295 msgid "" "Extents are not enabled. The file extent tree can be checksummed, whereas " "block maps cannot. Not enabling extents reduces the coverage of metadata " "checksumming. Re-run with -O extent to rectify.\n" msgstr "" -#: misc/tune2fs.c:1301 +#: misc/tune2fs.c:1302 msgid "" "64-bit filesystem support is not enabled. The larger fields afforded by " "this feature enable full-strength checksumming. Run resize2fs -b to " "rectify.\n" msgstr "" -#: misc/tune2fs.c:1327 +#: misc/tune2fs.c:1328 msgid "Disabling checksums could take some time." msgstr "" -#: misc/tune2fs.c:1330 +#: misc/tune2fs.c:1331 msgid "Cannot disable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1371 +#: misc/tune2fs.c:1372 msgid "Cannot enable uninit_bg on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1386 +#: misc/tune2fs.c:1387 msgid "Cannot disable uninit_bg on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1405 +#: misc/tune2fs.c:1406 #, c-format msgid "Cannot enable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1415 +#: misc/tune2fs.c:1416 #, c-format msgid "Cannot disable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1445 +#: misc/tune2fs.c:1446 #, c-format msgid "Cannot enable project feature; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1466 +#: misc/tune2fs.c:1467 msgid "" "\n" "Warning: '^quota' option overrides '-Q'arguments.\n" msgstr "" -#: misc/tune2fs.c:1483 misc/tune2fs.c:2245 +#: misc/tune2fs.c:1484 misc/tune2fs.c:2246 msgid "" "The casefold feature may only be enabled when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:1495 +#: misc/tune2fs.c:1496 msgid "" "Setting feature 'metadata_csum_seed' is only supported\n" "on filesystems with the metadata_csum feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1513 +#: misc/tune2fs.c:1514 msgid "" "UUID has changed since enabling metadata_csum. Filesystem must be " "unmounted \n" "to safely rewrite all metadata to match the new UUID.\n" msgstr "" -#: misc/tune2fs.c:1519 +#: misc/tune2fs.c:1520 msgid "Recalculating checksums could take some time." msgstr "" -#: misc/tune2fs.c:1562 +#: misc/tune2fs.c:1563 msgid "The filesystem already has a journal.\n" msgstr "" -#: misc/tune2fs.c:1582 +#: misc/tune2fs.c:1583 #, c-format msgid "" "\n" "\twhile trying to open journal on %s\n" msgstr "" -#: misc/tune2fs.c:1586 +#: misc/tune2fs.c:1587 #, c-format msgid "Creating journal on device %s: " msgstr "" -#: misc/tune2fs.c:1594 +#: misc/tune2fs.c:1595 #, c-format msgid "while adding filesystem to journal on %s" msgstr "" -#: misc/tune2fs.c:1600 +#: misc/tune2fs.c:1601 msgid "Creating journal inode: " msgstr "" -#: misc/tune2fs.c:1614 +#: misc/tune2fs.c:1615 msgid "" "\n" "\twhile trying to create journal file" msgstr "" -#: misc/tune2fs.c:1656 +#: misc/tune2fs.c:1657 #, c-format msgid "Cannot enable project quota; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1669 +#: misc/tune2fs.c:1670 msgid "while initializing quota context in support library" msgstr "" -#: misc/tune2fs.c:1685 +#: misc/tune2fs.c:1686 #, c-format msgid "while updating quota limits (%d)" msgstr "" -#: misc/tune2fs.c:1695 +#: misc/tune2fs.c:1696 #, c-format msgid "while writing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1713 +#: misc/tune2fs.c:1714 #, c-format msgid "while removing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1756 +#: misc/tune2fs.c:1757 msgid "" "\n" "Bad quota options specified.\n" @@ -6388,65 +6395,65 @@ msgid "" "\n" msgstr "" -#: misc/tune2fs.c:1814 +#: misc/tune2fs.c:1815 #, c-format msgid "Couldn't parse date/time specifier: %s" msgstr "" -#: misc/tune2fs.c:1846 misc/tune2fs.c:1857 +#: misc/tune2fs.c:1847 misc/tune2fs.c:1858 #, c-format msgid "bad mounts count - %s" msgstr "" -#: misc/tune2fs.c:1900 +#: misc/tune2fs.c:1901 #, c-format msgid "bad gid/group name - %s" msgstr "" -#: misc/tune2fs.c:1933 +#: misc/tune2fs.c:1934 #, c-format msgid "bad interval - %s" msgstr "" -#: misc/tune2fs.c:1962 +#: misc/tune2fs.c:1963 #, c-format msgid "bad reserved block ratio - %s" msgstr "" -#: misc/tune2fs.c:1977 +#: misc/tune2fs.c:1978 msgid "-o may only be specified once" msgstr "" -#: misc/tune2fs.c:1986 +#: misc/tune2fs.c:1987 msgid "-O may only be specified once" msgstr "" -#: misc/tune2fs.c:2003 +#: misc/tune2fs.c:2004 #, c-format msgid "bad reserved blocks count - %s" msgstr "" -#: misc/tune2fs.c:2032 +#: misc/tune2fs.c:2033 #, c-format msgid "bad uid/user name - %s" msgstr "" -#: misc/tune2fs.c:2049 +#: misc/tune2fs.c:2050 #, c-format msgid "bad inode size - %s" msgstr "" -#: misc/tune2fs.c:2056 +#: misc/tune2fs.c:2057 #, c-format msgid "Inode size must be a power of two- %s" msgstr "" -#: misc/tune2fs.c:2156 +#: misc/tune2fs.c:2157 #, c-format msgid "mmp_update_interval too big: %lu\n" msgstr "" -#: misc/tune2fs.c:2161 +#: misc/tune2fs.c:2162 #, c-format msgid "Setting multiple mount protection update interval to %lu second\n" msgid_plural "" @@ -6454,52 +6461,52 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: misc/tune2fs.c:2170 +#: misc/tune2fs.c:2171 #, c-format msgid "Setting filesystem error flag to force fsck.\n" msgstr "" -#: misc/tune2fs.c:2188 +#: misc/tune2fs.c:2189 #, c-format msgid "Invalid RAID stride: %s\n" msgstr "" -#: misc/tune2fs.c:2203 +#: misc/tune2fs.c:2204 #, c-format msgid "Invalid RAID stripe-width: %s\n" msgstr "" -#: misc/tune2fs.c:2218 +#: misc/tune2fs.c:2219 #, c-format msgid "Invalid hash algorithm: %s\n" msgstr "" -#: misc/tune2fs.c:2224 +#: misc/tune2fs.c:2225 #, c-format msgid "Setting default hash algorithm to %s (%d)\n" msgstr "" -#: misc/tune2fs.c:2251 +#: misc/tune2fs.c:2252 #, c-format msgid "Cannot alter existing encoding\n" msgstr "" -#: misc/tune2fs.c:2257 +#: misc/tune2fs.c:2258 #, c-format msgid "Invalid encoding: %s\n" msgstr "" -#: misc/tune2fs.c:2263 +#: misc/tune2fs.c:2264 #, c-format msgid "Setting encoding to '%s'\n" msgstr "" -#: misc/tune2fs.c:2287 +#: misc/tune2fs.c:2288 #, c-format msgid "Setting encoding_flags to '%s'\n" msgstr "" -#: misc/tune2fs.c:2297 +#: misc/tune2fs.c:2298 msgid "" "\n" "Bad options specified.\n" @@ -6521,72 +6528,72 @@ msgid "" "\tencoding_flags=<flags>\n" msgstr "" -#: misc/tune2fs.c:2713 +#: misc/tune2fs.c:2714 msgid "Failed to read inode bitmap\n" msgstr "" -#: misc/tune2fs.c:2718 +#: misc/tune2fs.c:2719 msgid "Failed to read block bitmap\n" msgstr "" -#: misc/tune2fs.c:2735 resize/resize2fs.c:1372 +#: misc/tune2fs.c:2736 resize/resize2fs.c:1372 msgid "blocks to be moved" msgstr "" -#: misc/tune2fs.c:2738 +#: misc/tune2fs.c:2739 msgid "Failed to allocate block bitmap when increasing inode size\n" msgstr "" -#: misc/tune2fs.c:2744 +#: misc/tune2fs.c:2745 msgid "Not enough space to increase inode size \n" msgstr "" -#: misc/tune2fs.c:2749 +#: misc/tune2fs.c:2750 msgid "Failed to relocate blocks during inode resize \n" msgstr "" -#: misc/tune2fs.c:2781 +#: misc/tune2fs.c:2782 msgid "" "Error in resizing the inode size.\n" "Run e2undo to undo the file system changes. \n" msgstr "" -#: misc/tune2fs.c:2992 +#: misc/tune2fs.c:2995 msgid "" "If you are sure the filesystem is not in use on any node, run:\n" "'tune2fs -f -E clear_mmp {device}'\n" msgstr "" -#: misc/tune2fs.c:2999 +#: misc/tune2fs.c:3002 #, c-format msgid "" "MMP block magic is bad. Try to fix it by running:\n" "'e2fsck -f %s'\n" msgstr "" -#: misc/tune2fs.c:3011 +#: misc/tune2fs.c:3014 msgid "Cannot modify a journal device.\n" msgstr "" -#: misc/tune2fs.c:3024 +#: misc/tune2fs.c:3027 #, c-format msgid "The inode size is already %lu\n" msgstr "" -#: misc/tune2fs.c:3031 +#: misc/tune2fs.c:3034 msgid "Shrinking inode size is not supported\n" msgstr "" -#: misc/tune2fs.c:3036 +#: misc/tune2fs.c:3039 #, c-format msgid "Invalid inode size %lu (max %d)\n" msgstr "" -#: misc/tune2fs.c:3042 +#: misc/tune2fs.c:3045 msgid "Resizing inodes could take some time." msgstr "" -#: misc/tune2fs.c:3091 +#: misc/tune2fs.c:3094 #, c-format msgid "" "Warning: The journal is dirty. You may wish to replay the journal like:\n" @@ -6597,201 +6604,201 @@ msgid "" "by journal recovery.\n" msgstr "" -#: misc/tune2fs.c:3100 +#: misc/tune2fs.c:3103 #, c-format msgid "Recovering journal.\n" msgstr "" -#: misc/tune2fs.c:3124 +#: misc/tune2fs.c:3125 #, c-format msgid "Setting maximal mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3130 +#: misc/tune2fs.c:3131 #, c-format msgid "Setting current mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3135 +#: misc/tune2fs.c:3136 #, c-format msgid "Setting error behavior to %d\n" msgstr "" -#: misc/tune2fs.c:3140 +#: misc/tune2fs.c:3141 #, c-format msgid "Setting reserved blocks gid to %lu\n" msgstr "" -#: misc/tune2fs.c:3145 +#: misc/tune2fs.c:3146 #, c-format msgid "interval between checks is too big (%lu)" msgstr "" -#: misc/tune2fs.c:3152 +#: misc/tune2fs.c:3153 #, c-format msgid "Setting interval between checks to %lu seconds\n" msgstr "" -#: misc/tune2fs.c:3159 +#: misc/tune2fs.c:3160 #, c-format msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n" msgstr "" -#: misc/tune2fs.c:3166 +#: misc/tune2fs.c:3167 #, c-format msgid "reserved blocks count is too big (%llu)" msgstr "" -#: misc/tune2fs.c:3173 +#: misc/tune2fs.c:3174 #, c-format msgid "Setting reserved blocks count to %llu\n" msgstr "" -#: misc/tune2fs.c:3178 +#: misc/tune2fs.c:3179 msgid "" "\n" "The filesystem already has sparse superblocks.\n" msgstr "" -#: misc/tune2fs.c:3181 +#: misc/tune2fs.c:3182 msgid "" "\n" "Setting the sparse superblock flag not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3191 +#: misc/tune2fs.c:3192 #, c-format msgid "" "\n" "Sparse superblock flag set. %s" msgstr "" -#: misc/tune2fs.c:3196 +#: misc/tune2fs.c:3197 msgid "" "\n" "Clearing the sparse superblock flag not supported.\n" msgstr "" -#: misc/tune2fs.c:3204 +#: misc/tune2fs.c:3205 #, c-format msgid "Setting time filesystem last checked to %s\n" msgstr "" -#: misc/tune2fs.c:3210 +#: misc/tune2fs.c:3211 #, c-format msgid "Setting reserved blocks uid to %lu\n" msgstr "" -#: misc/tune2fs.c:3242 +#: misc/tune2fs.c:3243 msgid "Error in using clear_mmp. It must be used with -f\n" msgstr "" -#: misc/tune2fs.c:3260 +#: misc/tune2fs.c:3262 msgid "" "The quota feature may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3277 +#: misc/tune2fs.c:3279 msgid "" "Cannot change the UUID of this filesystem because it has the stable_inodes " "feature flag.\n" msgstr "" -#: misc/tune2fs.c:3287 +#: misc/tune2fs.c:3289 msgid "Setting the UUID on this filesystem could take some time." msgstr "" -#: misc/tune2fs.c:3304 +#: misc/tune2fs.c:3306 msgid "The UUID may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3307 +#: misc/tune2fs.c:3309 msgid "" "If you only use kernels newer than v4.4, run 'tune2fs -O metadata_csum_seed' " "and re-run this command.\n" msgstr "" -#: misc/tune2fs.c:3338 +#: misc/tune2fs.c:3340 msgid "Invalid UUID format\n" msgstr "" -#: misc/tune2fs.c:3354 +#: misc/tune2fs.c:3356 msgid "Need to update journal superblock.\n" msgstr "" -#: misc/tune2fs.c:3376 +#: misc/tune2fs.c:3378 msgid "The inode size may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3383 +#: misc/tune2fs.c:3385 msgid "" "Changing the inode size not supported for filesystems with the flex_bg\n" "feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3401 +#: misc/tune2fs.c:3403 #, c-format msgid "Setting inode size %lu\n" msgstr "" -#: misc/tune2fs.c:3405 +#: misc/tune2fs.c:3407 msgid "Failed to change inode size\n" msgstr "" -#: misc/tune2fs.c:3419 +#: misc/tune2fs.c:3421 #, c-format msgid "Setting stride size to %d\n" msgstr "" -#: misc/tune2fs.c:3424 +#: misc/tune2fs.c:3426 #, c-format msgid "Setting stripe width to %d\n" msgstr "" -#: misc/tune2fs.c:3431 +#: misc/tune2fs.c:3433 #, c-format msgid "Setting extended default mount options to '%s'\n" msgstr "" -#: misc/util.c:101 +#: misc/util.c:102 msgid "<proceeding>\n" msgstr "" -#: misc/util.c:105 +#: misc/util.c:106 #, c-format msgid "Proceed anyway (or wait %d seconds to proceed) ? (y,N) " msgstr "" -#: misc/util.c:109 +#: misc/util.c:110 msgid "Proceed anyway? (y,N) " msgstr "" -#: misc/util.c:136 +#: misc/util.c:137 msgid "mke2fs forced anyway. Hope /etc/mtab is incorrect.\n" msgstr "" -#: misc/util.c:141 +#: misc/util.c:142 #, c-format msgid "will not make a %s here!\n" msgstr "" -#: misc/util.c:148 +#: misc/util.c:149 msgid "mke2fs forced anyway.\n" msgstr "" -#: misc/util.c:164 +#: misc/util.c:165 msgid "Couldn't allocate memory to parse journal options!\n" msgstr "" -#: misc/util.c:189 +#: misc/util.c:190 #, c-format msgid "" "\n" "Could not find journal device matching %s\n" msgstr "" -#: misc/util.c:224 +#: misc/util.c:225 msgid "" "\n" "Bad journal options specified.\n" @@ -6808,13 +6815,13 @@ msgid "" "\n" msgstr "" -#: misc/util.c:267 +#: misc/util.c:268 msgid "" "\n" "Filesystem too small for a journal\n" msgstr "" -#: misc/util.c:284 +#: misc/util.c:285 #, c-format msgid "" "\n" @@ -6822,13 +6829,13 @@ msgid "" "between 1024 and 10240000 blocks. Aborting.\n" msgstr "" -#: misc/util.c:292 +#: misc/util.c:293 msgid "" "\n" "Total journal size too big for filesystem.\n" msgstr "" -#: misc/util.c:305 +#: misc/util.c:306 #, c-format msgid "" "This filesystem will be automatically checked every %d mounts or\n" @@ -6968,11 +6975,11 @@ msgstr "" msgid "Usage: %s [-r] [-t]\n" msgstr "" -#: resize/extent.c:202 +#: resize/extent.c:200 msgid "# Extent dump:\n" msgstr "" -#: resize/extent.c:203 +#: resize/extent.c:201 #, c-format msgid "#\tNum=%llu, Size=%llu, Cursor=%llu, Sorted=%llu\n" msgstr "" @@ -7022,51 +7029,51 @@ msgid "" "\n" msgstr "" -#: resize/main.c:368 +#: resize/main.c:374 #, c-format msgid "while opening %s" msgstr "" -#: resize/main.c:376 +#: resize/main.c:382 #, c-format msgid "while getting stat information for %s" msgstr "" -#: resize/main.c:457 +#: resize/main.c:463 #, c-format msgid "" "Please run 'e2fsck -f %s' first.\n" "\n" msgstr "" -#: resize/main.c:476 +#: resize/main.c:482 #, c-format msgid "Estimated minimum size of the filesystem: %llu\n" msgstr "" -#: resize/main.c:516 +#: resize/main.c:522 #, c-format msgid "Invalid new size: %s\n" msgstr "" -#: resize/main.c:535 +#: resize/main.c:541 msgid "New size too large to be expressed in 32 bits\n" msgstr "" -#: resize/main.c:548 +#: resize/main.c:560 msgid "New size results in too many block group descriptors.\n" msgstr "" -#: resize/main.c:555 +#: resize/main.c:567 #, c-format msgid "New size smaller than minimum (%llu)\n" msgstr "" -#: resize/main.c:562 +#: resize/main.c:574 msgid "Invalid stride length" msgstr "" -#: resize/main.c:586 +#: resize/main.c:598 #, c-format msgid "" "The containing partition (or device) is only %llu (%dk) blocks.\n" @@ -7074,89 +7081,89 @@ msgid "" "\n" msgstr "" -#: resize/main.c:593 +#: resize/main.c:605 #, c-format msgid "Cannot set and unset 64bit feature.\n" msgstr "" -#: resize/main.c:597 +#: resize/main.c:609 #, c-format msgid "" "Cannot change the 64bit feature on a filesystem that is larger than 2^32 " "blocks.\n" msgstr "" -#: resize/main.c:603 +#: resize/main.c:615 #, c-format msgid "Cannot change the 64bit feature while the filesystem is mounted.\n" msgstr "" -#: resize/main.c:609 +#: resize/main.c:621 #, c-format msgid "" "Please enable the extents feature with tune2fs before enabling the 64bit " "feature.\n" msgstr "" -#: resize/main.c:617 +#: resize/main.c:629 #, c-format msgid "" "The filesystem is already %llu (%dk) blocks long. Nothing to do!\n" "\n" msgstr "" -#: resize/main.c:627 +#: resize/main.c:639 #, c-format msgid "The filesystem is already 64-bit.\n" msgstr "" -#: resize/main.c:632 +#: resize/main.c:644 #, c-format msgid "The filesystem is already 32-bit.\n" msgstr "" -#: resize/main.c:637 +#: resize/main.c:649 #, c-format msgid "" "Cannot shrink this filesystem because it has the stable_inodes feature " "flag.\n" msgstr "" -#: resize/main.c:646 +#: resize/main.c:658 #, c-format msgid "Converting the filesystem to 64-bit.\n" msgstr "" -#: resize/main.c:648 +#: resize/main.c:660 #, c-format msgid "Converting the filesystem to 32-bit.\n" msgstr "" -#: resize/main.c:650 +#: resize/main.c:662 #, c-format msgid "Resizing the filesystem on %s to %llu (%dk) blocks.\n" msgstr "" -#: resize/main.c:660 +#: resize/main.c:672 #, c-format msgid "while trying to resize %s" msgstr "" -#: resize/main.c:663 +#: resize/main.c:675 #, c-format msgid "" "Please run 'e2fsck -fy %s' to fix the filesystem\n" "after the aborted resize operation.\n" msgstr "" -#: resize/main.c:668 +#: resize/main.c:680 #, c-format msgid "" "The filesystem on %s is now %llu (%dk) blocks long.\n" "\n" msgstr "" -#: resize/main.c:683 +#: resize/main.c:695 #, c-format msgid "while trying to truncate %s" msgstr "" @@ -7242,19 +7249,19 @@ msgstr "" msgid "meta-data blocks" msgstr "" -#: resize/resize2fs.c:1481 resize/resize2fs.c:2523 +#: resize/resize2fs.c:1481 resize/resize2fs.c:2525 msgid "new meta blocks" msgstr "" -#: resize/resize2fs.c:2747 +#: resize/resize2fs.c:2749 msgid "Should never happen! No sb in last super_sparse bg?\n" msgstr "" -#: resize/resize2fs.c:2752 +#: resize/resize2fs.c:2754 msgid "Should never happen! Unexpected old_desc in super_sparse bg?\n" msgstr "" -#: resize/resize2fs.c:2825 +#: resize/resize2fs.c:2827 msgid "Should never happen: resize inode corrupt!\n" msgstr "" @@ -7982,6 +7989,14 @@ msgstr "" msgid "The internal ext2_filsys data structure appears to be corrupted" msgstr "" +#: lib/ext2fs/ext2_err.c:192 +msgid "Found cyclic loop in extent tree" +msgstr "" + +#: lib/ext2fs/ext2_err.c:193 +msgid "Operation not supported on an external journal" +msgstr "" + #: lib/support/prof_err.c:11 msgid "Profile version 0.0" msgstr "" @@ -7,5 +7,5 @@ * file may be redistributed under the GNU Public License v2. */ -#define E2FSPROGS_VERSION "1.46.6-rc0" -#define E2FSPROGS_DATE "1-Sep-2022" +#define E2FSPROGS_VERSION "1.46.6-rc1" +#define E2FSPROGS_DATE "12-Sep-2022" |