From 68e00dc507acc3f3381f8f60bce71ecae371f794 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 6 Mar 2019 13:23:53 -0500 Subject: [PATCH] Update release notes, etc., for the 1.45.0 release Signed-off-by: Theodore Ts'o --- README | 2 +- RELEASE-NOTES | 2 +- debian/changelog | 23 ++ debian/control | 18 +- debian/libext2fs2.symbols | 22 + doc/RelNotes/v1.45.0.txt | 40 ++ doc/libext2fs.texinfo | 6 +- e2fsprogs.lsm | 8 +- e2fsprogs.spec | 2 +- po/e2fsprogs.pot | 996 ++++++++++++++++++++++++---------------------- version.h | 4 +- 11 files changed, 634 insertions(+), 489 deletions(-) create mode 100644 doc/RelNotes/v1.45.0.txt diff --git a/README b/README index 2cd9016..7e800e8 100644 --- a/README +++ b/README @@ -1,4 +1,4 @@ - This is the new version (1.44.6) of the second extended file + This is the new version (1.45.0) 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 27d57ed..3734e10 120000 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -1 +1 @@ -doc/RelNotes/v1.44.6.txt \ No newline at end of file +doc/RelNotes/v1.45.0.txt \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index a9a29e1..91dd714 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +e2fsprogs (1.45.0-1) unstable; urgency=medium + + * New upstream feature + * tune2fs can now set the file system error bit to force a check at the + next fsck by using the extended option "force_fsck". + * There is now an e2scrub script which will allow e2fsck to be run + on mounted file systems using an LVM device. There will be a systemd + script to automatically run e2scrub on all ext4* file systems where it + can be supported. + * mke2fs will attempt avoid discarding pre-allocated blocks when + initializing a file system on a file. + * The fuse2fs command now supports a "fakeroot" option to allow an + unprivileged user to fuse2fs to modify rootfs images. + * Add initial support for the character set and case-folding file system + feature. + * Debugfs can now set the inode's checksum field + * E2image now accepts the -b and -B options to allow the user to specify + the superblock location when creating a raw or qcow2 image. + * Update the debhelper compatibility level to 11 + * Update the Debian policy compliance to 4.3.0 + + -- Theodore Y. Ts'o Wed, 06 Mar 2019 12:55:18 -0500 + e2fsprogs (1.44.6-1) unstable; urgency=medium * New upstream version diff --git a/debian/control b/debian/control index 7b68bbe..1bb8adb 100644 --- a/debian/control +++ b/debian/control @@ -2,8 +2,8 @@ Source: e2fsprogs Section: admin Priority: required Maintainer: Theodore Y. Ts'o -Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] , libattr1-dev, debhelper (>= 9.0), libblkid-dev, uuid-dev, m4 -Standards-Version: 4.2.1 +Build-Depends: gettext, texinfo, pkg-config, libfuse-dev [linux-any kfreebsd-any] , libattr1-dev, debhelper (>= 11.0), libblkid-dev, uuid-dev, m4, udev, systemd, cron +Standards-Version: 4.3.0 Homepage: http://e2fsprogs.sourceforge.net Vcs-Browser: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git Vcs-Git: https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git -b debian/master @@ -55,8 +55,8 @@ Architecture: any Multi-Arch: same Priority: optional Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. +Description: transitional package to libcom-err2 + This is a transitional package to libcom-err2. It can safely be removed. Package: libcom-err2 Section: libs @@ -138,16 +138,16 @@ Architecture: any Multi-Arch: same Priority: optional Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. +Description: transitional package to libext2fs2 + This is a transitional package to libext2fs2. It can safely be removed. Package: e2fslibs-dev Depends: libext2fs-dev, ${misc:Depends} Architecture: all Priority: optional Section: oldlibs -Description: transitional package - This is a transitional package. It can safely be removed. +Description: transitional package to libext2fs-dev + This is a transitional package to libext2fs-dev. It can safely be removed. Package: libext2fs2 Section: libs @@ -191,7 +191,7 @@ XB-Important: yes Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libblkid1, libuuid1 Multi-Arch: foreign Suggests: gpart, parted, fuse2fs, e2fsck-static -Recommends: e2fsprogs-l10n, lvm2, util-linux, coreutils +Recommends: e2fsprogs-l10n, lvm2 Architecture: any Description: ext2/ext3/ext4 file system utilities The ext2, ext3 and ext4 file systems are successors of the original ext diff --git a/debian/libext2fs2.symbols b/debian/libext2fs2.symbols index 8ec9cd8..f7c54b3 100644 --- a/debian/libext2fs2.symbols +++ b/debian/libext2fs2.symbols @@ -5,6 +5,7 @@ libe2p.so.2 libext2fs2 #MINVER# e2p_edit_mntopts@Base 1.37 e2p_encmode2string@Base 1.43 e2p_feature2string@Base 1.37 + e2p_get_encoding_flags@Base 1.45 e2p_hash2string@Base 1.37 e2p_is_null_uuid@Base 1.37 e2p_jrnl_feature2string@Base 1.41.1 @@ -13,6 +14,8 @@ libe2p.so.2 libext2fs2 #MINVER# e2p_mntopt2string@Base 1.37 e2p_os2string@Base 1.37 e2p_percent@Base 1.40 + e2p_str2encoding@Base 1.45 + e2p_str2encoding_flags@Base 1.45 e2p_string2encmode@Base 1.43 e2p_string2feature@Base 1.37 e2p_string2hash@Base 1.37 @@ -171,6 +174,7 @@ libext2fs.so.2 libext2fs2 #MINVER# ext2fs_dirent_name_len@Base 1.43 ext2fs_dirent_set_file_type@Base 1.43 ext2fs_dirent_set_name_len@Base 1.43 + ext2fs_dirhash2@Base 1.45 ext2fs_dirhash@Base 1.37 ext2fs_div64_ceil@Base 1.42 ext2fs_div_ceil@Base 1.40 @@ -249,6 +253,7 @@ libext2fs.so.2 libext2fs2 #MINVER# ext2fs_find_first_zero_generic_bmap@Base 1.42.2 ext2fs_find_first_zero_inode_bitmap2@Base 1.42.2 ext2fs_find_inode_goal@Base 1.43 + ext2fs_fix_extents_checksums@Base 1.45 ext2fs_flush2@Base 1.42 ext2fs_flush@Base 1.37 ext2fs_flush_icache@Base 1.37 @@ -461,6 +466,7 @@ libext2fs.so.2 libext2fs2 #MINVER# ext2fs_read_ext_attr3@Base 1.43 ext2fs_read_ext_attr@Base 1.37 ext2fs_read_ind_block@Base 1.37 + ext2fs_read_inode2@Base 1.45 ext2fs_read_inode@Base 1.37 ext2fs_read_inode_bitmap@Base 1.37 ext2fs_read_inode_full@Base 1.37 @@ -615,6 +621,7 @@ libext2fs.so.2 libext2fs2 #MINVER# ext2fs_write_ext_attr3@Base 1.43 ext2fs_write_ext_attr@Base 1.37 ext2fs_write_ind_block@Base 1.37 + ext2fs_write_inode2@Base 1.45 ext2fs_write_inode@Base 1.37 ext2fs_write_inode_bitmap@Base 1.37 ext2fs_write_inode_full@Base 1.37 @@ -643,6 +650,8 @@ libext2fs.so.2 libext2fs2 #MINVER# io_channel_write_blk64@Base 1.41.1 io_channel_write_byte@Base 1.37 io_channel_zeroout@Base 1.43 + nls_ascii@Base 1.45 + nls_utf8_11_0@Base 1.45 qcow2_read_header@Base 1.42 qcow2_write_raw_image@Base 1.42 set_undo_io_backing_manager@Base 1.41.0 @@ -660,3 +669,16 @@ libext2fs.so.2 libext2fs2 #MINVER# undo_io_manager@Base 1.41.0 unix_io_manager@Base 1.37 unixfd_io_manager@Base 1.43.2 + utf8agemax@Base 1.45 + utf8agemin@Base 1.45 + utf8byte@Base 1.45 + utf8cursor@Base 1.45 + utf8len@Base 1.45 + utf8nagemax@Base 1.45 + utf8nagemin@Base 1.45 + utf8ncursor@Base 1.45 + utf8nfkdi@Base 1.45 + utf8nfkdicf@Base 1.45 + utf8nlen@Base 1.45 + utf8version_is_supported@Base 1.45 + utf8version_latest@Base 1.45 diff --git a/doc/RelNotes/v1.45.0.txt b/doc/RelNotes/v1.45.0.txt new file mode 100644 index 0000000..d92c11b --- /dev/null +++ b/doc/RelNotes/v1.45.0.txt @@ -0,0 +1,40 @@ +E2fsprogs 1.45.0 (March 6, 2019) +================================ + +Updates/Fixes since v1.44.6: + +UI and Features +--------------- + +Tune2fs can now set the file system error bit to force a check at the +next fsck by using the extended option "force_fsck". + +E2fsprogs now has an e2scrub script which will allow e2fsck to be run on +volumes that are mounted on an LVM device. The e2scrub_all will find +all ext* file systems and run them using e2scrub (if possible). + +Mke2fs will attempt to use ZERO_RANGE before PUNCH_HOLE so that we don't +lose allocated blocks in preallocated files. + +The fuse2fs command now supports a "fakeroot" option to allow an +unprivileged user to fuse2fs to modify rootfs images. + +Add initial support for setting the character set encoding and case +folding file system feature. We don't have support to validate file +names as being valid for a given character set encoding yet, but this +will allow compatibility for this feature when the kernel support +lands. This includes support in lsattr and chattr to understanding the +casefold attribute flag. + +Debugfs can now set the inode's checksum field to test support for +inodes with bad inode checksums. + +E2image now accepts the -b and -B options to allow the user to specify +the superblock location when creating a raw or qcow2 image. + + +Performance, Internal Implementation, Development Support etc. +-------------------------------------------------------------- + +Add support for building e2fsprogs using Link Time Optimization (LTO), +UBSAN, Address Sanitizer, or Thread Sanitizer. diff --git a/doc/libext2fs.texinfo b/doc/libext2fs.texinfo index fff45b7..3e82de9 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.44.6) +@settitle The EXT2FS Library (version 1.45.0) @synindex tp fn @comment %**end of header @@ -60,7 +60,7 @@ by the author. @title The EXT2FS Library @subtitle The EXT2FS Library -@subtitle Version 1.44.6 +@subtitle Version 1.45.0 @subtitle March 2019 @author by Theodore Ts'o @@ -101,7 +101,7 @@ by the Foundation. @top The EXT2FS Library -This manual documents the EXT2FS Library, version 1.44.6. +This manual documents the EXT2FS Library, version 1.45.0. @menu * Introduction to the EXT2FS Library:: diff --git a/e2fsprogs.lsm b/e2fsprogs.lsm index 1b36e92..e4c9de5 100644 --- a/e2fsprogs.lsm +++ b/e2fsprogs.lsm @@ -1,15 +1,15 @@ Begin3 Title: EXT2 Filesystem utilities -Version: 1.44.6 -Entered-date: 2019-3-5 +Version: 1.45.0 +Entered-date: 2019-3-6 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 - 7448kB e2fsprogs-1.44.6.tar.gz - 1kB e2fsprogs-1.44.6.lsm + 7556kB e2fsprogs-1.45.0.tar.gz + 1kB e2fsprogs-1.45.0.lsm Alternate-site: download.sourceforge.net /pub/sourceforge/e2fsprogs Platforms: linux 1.2.x/1.3.x/2.0.x/2.1.x/2.2.x/2.3.x/2.4.x/2.5.x/2.6.x/3.x/4.x Copying-policy: GPL-2/LGPL-2 diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 556349e..46483ab 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -5,7 +5,7 @@ Summary: Utilities for managing ext2/ext3/ext4 filesystems Name: e2fsprogs -Version: 1.44.5 +Version: 1.45.0 Release: 0 License: GPLv2 Group: System Environment/Base diff --git a/po/e2fsprogs.pot b/po/e2fsprogs.pot index e52bcd5..914c6d3 100644 --- a/po/e2fsprogs.pot +++ b/po/e2fsprogs.pot @@ -70,9 +70,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: e2fsprogs 1.44.6\n" +"Project-Id-Version: e2fsprogs 1.45.0\n" "Report-Msgid-Bugs-To: tytso@alum.mit.edu\n" -"POT-Creation-Date: 2019-03-05 14:46-0500\n" +"POT-Creation-Date: 2019-03-06 13:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -95,12 +95,12 @@ msgstr "" msgid "while reading the bad blocks inode" msgstr "" -#: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1550 -#: e2fsck/unix.c:1664 misc/badblocks.c:1251 misc/badblocks.c:1259 +#: e2fsck/badblocks.c:72 e2fsck/scantest.c:107 e2fsck/unix.c:1551 +#: e2fsck/unix.c:1665 misc/badblocks.c:1251 misc/badblocks.c:1259 #: misc/badblocks.c:1273 misc/badblocks.c:1285 misc/dumpe2fs.c:431 -#: misc/dumpe2fs.c:688 misc/dumpe2fs.c:692 misc/e2image.c:1412 -#: misc/e2image.c:1596 misc/e2image.c:1617 misc/mke2fs.c:236 -#: misc/tune2fs.c:2843 misc/tune2fs.c:2942 resize/main.c:414 +#: misc/dumpe2fs.c:688 misc/dumpe2fs.c:692 misc/e2image.c:1430 +#: misc/e2image.c:1627 misc/e2image.c:1648 misc/mke2fs.c:236 +#: misc/tune2fs.c:2796 misc/tune2fs.c:2895 resize/main.c:414 #, c-format msgid "while trying to open %s" msgstr "" @@ -202,12 +202,12 @@ msgstr "" msgid "Usage: %s [-F] [-I inode_buffer_blocks] device\n" msgstr "" -#: e2fsck/iscan.c:81 e2fsck/unix.c:1075 +#: e2fsck/iscan.c:81 e2fsck/unix.c:1076 #, c-format msgid "while opening %s for flushing" msgstr "" -#: e2fsck/iscan.c:86 e2fsck/unix.c:1081 resize/main.c:383 +#: e2fsck/iscan.c:86 e2fsck/unix.c:1082 resize/main.c:383 #, c-format msgid "while trying to flush %s" msgstr "" @@ -217,11 +217,11 @@ msgstr "" msgid "while trying to open '%s'" msgstr "" -#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:1305 +#: e2fsck/iscan.c:119 e2fsck/scantest.c:114 misc/e2image.c:1323 msgid "while opening inode scan" msgstr "" -#: e2fsck/iscan.c:127 misc/e2image.c:1324 +#: e2fsck/iscan.c:127 misc/e2image.c:1342 msgid "while getting next inode" msgstr "" @@ -244,7 +244,7 @@ msgstr "" msgid "%s: journal too short\n" msgstr "" -#: e2fsck/journal.c:972 misc/fuse2fs.c:3786 +#: e2fsck/journal.c:972 misc/fuse2fs.c:3792 #, c-format msgid "%s: recovering journal\n" msgstr "" @@ -515,86 +515,86 @@ msgstr "" msgid "internal error: couldn't lookup EA inode record for %u" msgstr "" -#: e2fsck/pass1.c:356 +#: e2fsck/pass1.c:357 #, c-format msgid "while hashing entry with e_value_inum = %u" msgstr "" -#: e2fsck/pass1.c:774 e2fsck/pass2.c:1005 +#: e2fsck/pass1.c:775 e2fsck/pass2.c:1006 msgid "reading directory block" msgstr "" -#: e2fsck/pass1.c:1223 +#: e2fsck/pass1.c:1224 msgid "in-use inode map" msgstr "" -#: e2fsck/pass1.c:1234 +#: e2fsck/pass1.c:1235 msgid "directory inode map" msgstr "" -#: e2fsck/pass1.c:1244 +#: e2fsck/pass1.c:1245 msgid "regular file inode map" msgstr "" -#: e2fsck/pass1.c:1253 misc/e2image.c:1280 +#: e2fsck/pass1.c:1254 misc/e2image.c:1282 msgid "in-use block map" msgstr "" -#: e2fsck/pass1.c:1262 +#: e2fsck/pass1.c:1263 msgid "metadata block map" msgstr "" -#: e2fsck/pass1.c:1324 +#: e2fsck/pass1.c:1325 msgid "opening inode scan" msgstr "" -#: e2fsck/pass1.c:1362 +#: e2fsck/pass1.c:1363 msgid "getting next inode from scan" msgstr "" -#: e2fsck/pass1.c:2066 +#: e2fsck/pass1.c:2067 msgid "Pass 1" msgstr "" -#: e2fsck/pass1.c:2127 +#: e2fsck/pass1.c:2128 #, c-format msgid "reading indirect blocks of inode %u" msgstr "" -#: e2fsck/pass1.c:2178 +#: e2fsck/pass1.c:2179 msgid "bad inode map" msgstr "" -#: e2fsck/pass1.c:2218 +#: e2fsck/pass1.c:2219 msgid "inode in bad block map" msgstr "" -#: e2fsck/pass1.c:2238 +#: e2fsck/pass1.c:2239 msgid "imagic inode map" msgstr "" -#: e2fsck/pass1.c:2269 +#: e2fsck/pass1.c:2270 msgid "multiply claimed block map" msgstr "" -#: e2fsck/pass1.c:2394 +#: e2fsck/pass1.c:2395 msgid "ext attr block map" msgstr "" -#: e2fsck/pass1.c:3638 +#: e2fsck/pass1.c:3639 #, c-format msgid "%6lu(%c): expecting %6lu got phys %6lu (blkcnt %lld)\n" msgstr "" -#: e2fsck/pass1.c:4058 +#: e2fsck/pass1.c:4059 msgid "block bitmap" msgstr "" -#: e2fsck/pass1.c:4064 +#: e2fsck/pass1.c:4065 msgid "inode bitmap" msgstr "" -#: e2fsck/pass1.c:4070 +#: e2fsck/pass1.c:4071 msgid "inode table" msgstr "" @@ -602,7 +602,7 @@ msgstr "" msgid "Pass 2" msgstr "" -#: e2fsck/pass2.c:1077 e2fsck/pass2.c:1244 +#: e2fsck/pass2.c:1078 e2fsck/pass2.c:1245 msgid "Can not continue." msgstr "" @@ -2903,7 +2903,7 @@ msgstr "" msgid "Clearing" msgstr "" -#: e2fsck/unix.c:77 +#: e2fsck/unix.c:78 #, c-format msgid "" "Usage: %s [-panyrcdfktvDFV] [-b superblock] [-B blocksize]\n" @@ -2911,7 +2911,7 @@ msgid "" "\t\t[-E extended-options] [-z undo_file] device\n" msgstr "" -#: e2fsck/unix.c:82 +#: e2fsck/unix.c:83 msgid "" "\n" "Emergency help:\n" @@ -2923,7 +2923,7 @@ msgid "" " -f Force checking even if filesystem is marked clean\n" msgstr "" -#: e2fsck/unix.c:88 +#: e2fsck/unix.c:89 msgid "" " -v Be verbose\n" " -b superblock Use alternative superblock\n" @@ -2934,12 +2934,12 @@ msgid "" " -z undo_file Create an undo file\n" msgstr "" -#: e2fsck/unix.c:136 +#: e2fsck/unix.c:137 #, c-format msgid "%s: %u/%u files (%0d.%d%% non-contiguous), %llu/%llu blocks\n" msgstr "" -#: e2fsck/unix.c:162 +#: e2fsck/unix.c:163 #, c-format msgid "" "\n" @@ -2950,51 +2950,51 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:166 +#: e2fsck/unix.c:167 #, 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:171 +#: e2fsck/unix.c:172 #, 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:176 +#: e2fsck/unix.c:177 #, c-format msgid " # of inodes with ind/dind/tind blocks: %u/%u/%u\n" msgstr "" -#: e2fsck/unix.c:184 +#: e2fsck/unix.c:185 msgid " Extent depth histogram: " msgstr "" -#: e2fsck/unix.c:193 +#: e2fsck/unix.c:194 #, 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:197 +#: e2fsck/unix.c:198 #, c-format msgid "%12u bad block\n" msgid_plural "%12u bad blocks\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:199 +#: e2fsck/unix.c:200 #, c-format msgid "%12u large file\n" msgid_plural "%12u large files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:201 +#: e2fsck/unix.c:202 #, c-format msgid "" "\n" @@ -3005,102 +3005,102 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:203 +#: e2fsck/unix.c:204 #, c-format msgid "%12u directory\n" msgid_plural "%12u directories\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:205 +#: e2fsck/unix.c:206 #, c-format msgid "%12u character device file\n" msgid_plural "%12u character device files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:208 +#: e2fsck/unix.c:209 #, c-format msgid "%12u block device file\n" msgid_plural "%12u block device files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:210 +#: e2fsck/unix.c:211 #, c-format msgid "%12u fifo\n" msgid_plural "%12u fifos\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:212 +#: e2fsck/unix.c:213 #, c-format msgid "%12u link\n" msgid_plural "%12u links\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:214 +#: e2fsck/unix.c:215 #, c-format msgid "%12u symbolic link" msgid_plural "%12u symbolic links" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:216 +#: e2fsck/unix.c:217 #, c-format msgid " (%u fast symbolic link)\n" msgid_plural " (%u fast symbolic links)\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:220 +#: e2fsck/unix.c:221 #, c-format msgid "%12u socket\n" msgid_plural "%12u sockets\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:224 +#: e2fsck/unix.c:225 #, c-format msgid "%12u file\n" msgid_plural "%12u files\n" msgstr[0] "" msgstr[1] "" -#: e2fsck/unix.c:237 misc/badblocks.c:1002 misc/tune2fs.c:3033 misc/util.c:126 +#: e2fsck/unix.c:238 misc/badblocks.c:1002 misc/tune2fs.c:2986 misc/util.c:126 #: resize/main.c:354 #, c-format msgid "while determining whether %s is mounted." msgstr "" -#: e2fsck/unix.c:258 +#: e2fsck/unix.c:259 #, c-format msgid "Warning! %s is mounted.\n" msgstr "" -#: e2fsck/unix.c:261 +#: e2fsck/unix.c:262 #, c-format msgid "Warning! %s is in use.\n" msgstr "" -#: e2fsck/unix.c:267 +#: e2fsck/unix.c:268 #, c-format msgid "%s is mounted.\n" msgstr "" -#: e2fsck/unix.c:269 +#: e2fsck/unix.c:270 #, c-format msgid "%s is in use.\n" msgstr "" -#: e2fsck/unix.c:271 +#: e2fsck/unix.c:272 msgid "" "Cannot continue, aborting.\n" "\n" msgstr "" -#: e2fsck/unix.c:273 +#: e2fsck/unix.c:274 msgid "" "\n" "\n" @@ -3109,85 +3109,85 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:278 +#: e2fsck/unix.c:279 msgid "Do you really want to continue" msgstr "" -#: e2fsck/unix.c:280 +#: e2fsck/unix.c:281 msgid "check aborted.\n" msgstr "" -#: e2fsck/unix.c:374 +#: e2fsck/unix.c:375 msgid " contains a file system with errors" msgstr "" -#: e2fsck/unix.c:376 +#: e2fsck/unix.c:377 msgid " was not cleanly unmounted" msgstr "" -#: e2fsck/unix.c:378 +#: e2fsck/unix.c:379 msgid " primary superblock features different from backup" msgstr "" -#: e2fsck/unix.c:382 +#: e2fsck/unix.c:383 #, c-format msgid " has been mounted %u times without being checked" msgstr "" -#: e2fsck/unix.c:389 +#: e2fsck/unix.c:390 msgid " has filesystem last checked time in the future" msgstr "" -#: e2fsck/unix.c:395 +#: e2fsck/unix.c:396 #, c-format msgid " has gone %u days without being checked" msgstr "" -#: e2fsck/unix.c:403 +#: e2fsck/unix.c:404 msgid "ignoring check interval, broken_system_clock set\n" msgstr "" -#: e2fsck/unix.c:409 +#: e2fsck/unix.c:410 msgid ", check forced.\n" msgstr "" -#: e2fsck/unix.c:442 +#: e2fsck/unix.c:443 #, c-format msgid "%s: clean, %u/%u files, %llu/%llu blocks" msgstr "" -#: e2fsck/unix.c:462 +#: e2fsck/unix.c:463 msgid " (check deferred; on battery)" msgstr "" -#: e2fsck/unix.c:465 +#: e2fsck/unix.c:466 msgid " (check after next mount)" msgstr "" -#: e2fsck/unix.c:467 +#: e2fsck/unix.c:468 #, c-format msgid " (check in %ld mounts)" msgstr "" -#: e2fsck/unix.c:617 +#: e2fsck/unix.c:618 #, c-format msgid "ERROR: Couldn't open /dev/null (%s)\n" msgstr "" -#: e2fsck/unix.c:688 +#: e2fsck/unix.c:689 msgid "Invalid EA version.\n" msgstr "" -#: e2fsck/unix.c:701 +#: e2fsck/unix.c:702 msgid "Invalid readahead buffer size.\n" msgstr "" -#: e2fsck/unix.c:750 +#: e2fsck/unix.c:751 #, c-format msgid "Unknown extended option: %s\n" msgstr "" -#: e2fsck/unix.c:758 +#: e2fsck/unix.c:759 msgid "" "\n" "Extended options are separated by commas, and may take an argument which\n" @@ -3195,77 +3195,77 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:762 +#: e2fsck/unix.c:763 msgid "\tea_ver=\n" msgstr "" -#: e2fsck/unix.c:771 +#: e2fsck/unix.c:772 msgid "\treadahead_kb=\n" msgstr "" -#: e2fsck/unix.c:783 +#: e2fsck/unix.c:784 #, c-format msgid "" "Syntax error in e2fsck config file (%s, line #%d)\n" "\t%s\n" msgstr "" -#: e2fsck/unix.c:856 +#: e2fsck/unix.c:857 #, c-format msgid "Error validating file descriptor %d: %s\n" msgstr "" -#: e2fsck/unix.c:860 +#: e2fsck/unix.c:861 msgid "Invalid completion information file descriptor" msgstr "" -#: e2fsck/unix.c:875 +#: e2fsck/unix.c:876 msgid "Only one of the options -p/-a, -n or -y may be specified." msgstr "" -#: e2fsck/unix.c:896 +#: e2fsck/unix.c:897 #, c-format msgid "The -t option is not supported on this version of e2fsck.\n" msgstr "" -#: e2fsck/unix.c:927 e2fsck/unix.c:1005 misc/e2initrd_helper.c:330 -#: misc/tune2fs.c:1747 misc/tune2fs.c:2042 misc/tune2fs.c:2060 +#: e2fsck/unix.c:928 e2fsck/unix.c:1006 misc/e2initrd_helper.c:330 +#: misc/tune2fs.c:1695 misc/tune2fs.c:1990 misc/tune2fs.c:2008 #, c-format msgid "Unable to resolve '%s'" msgstr "" -#: e2fsck/unix.c:984 +#: e2fsck/unix.c:985 msgid "The -n and -D options are incompatible." msgstr "" -#: e2fsck/unix.c:989 +#: e2fsck/unix.c:990 msgid "The -n and -c options are incompatible." msgstr "" -#: e2fsck/unix.c:994 +#: e2fsck/unix.c:995 msgid "The -n and -l/-L options are incompatible." msgstr "" -#: e2fsck/unix.c:1018 +#: e2fsck/unix.c:1019 msgid "The -D and -E fixes_only options are incompatible." msgstr "" -#: e2fsck/unix.c:1024 +#: e2fsck/unix.c:1025 msgid "The -E bmap2extent and fixes_only options are incompatible." msgstr "" -#: e2fsck/unix.c:1088 +#: e2fsck/unix.c:1089 msgid "The -c and the -l/-L options may not be both used at the same time.\n" msgstr "" -#: e2fsck/unix.c:1135 +#: e2fsck/unix.c:1136 #, c-format msgid "" "E2FSCK_JBD_DEBUG \"%s\" not an integer\n" "\n" msgstr "" -#: e2fsck/unix.c:1144 +#: e2fsck/unix.c:1145 #, c-format msgid "" "\n" @@ -3273,31 +3273,31 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:1235 +#: e2fsck/unix.c:1236 #, c-format msgid "" "MMP interval is %u seconds and total wait time is %u seconds. Please " "wait...\n" msgstr "" -#: e2fsck/unix.c:1252 e2fsck/unix.c:1257 +#: e2fsck/unix.c:1253 e2fsck/unix.c:1258 msgid "while checking MMP block" msgstr "" -#: e2fsck/unix.c:1259 +#: e2fsck/unix.c:1260 #, 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:1275 +#: e2fsck/unix.c:1276 msgid "while reading MMP block" msgstr "" -#: e2fsck/unix.c:1295 e2fsck/unix.c:1347 misc/e2undo.c:236 misc/e2undo.c:281 -#: misc/mke2fs.c:2613 misc/mke2fs.c:2664 misc/tune2fs.c:2760 -#: misc/tune2fs.c:2805 resize/main.c:188 resize/main.c:233 +#: e2fsck/unix.c:1296 e2fsck/unix.c:1348 misc/e2undo.c:236 misc/e2undo.c:281 +#: misc/mke2fs.c:2694 misc/mke2fs.c:2745 misc/tune2fs.c:2713 +#: misc/tune2fs.c:2758 resize/main.c:188 resize/main.c:233 #, c-format msgid "" "Overwriting existing filesystem; this can be undone using the command:\n" @@ -3305,205 +3305,210 @@ msgid "" "\n" msgstr "" -#: e2fsck/unix.c:1336 misc/e2undo.c:270 misc/mke2fs.c:2653 misc/tune2fs.c:2794 +#: e2fsck/unix.c:1337 misc/e2undo.c:270 misc/mke2fs.c:2734 misc/tune2fs.c:2747 #: resize/main.c:222 #, c-format msgid "while trying to delete %s" msgstr "" -#: e2fsck/unix.c:1362 misc/mke2fs.c:2679 resize/main.c:243 +#: e2fsck/unix.c:1363 misc/mke2fs.c:2760 resize/main.c:243 msgid "while trying to setup undo file\n" msgstr "" -#: e2fsck/unix.c:1405 +#: e2fsck/unix.c:1406 msgid "Error: ext2fs library version out of date!\n" msgstr "" -#: e2fsck/unix.c:1412 +#: e2fsck/unix.c:1413 msgid "while trying to initialize program" msgstr "" -#: e2fsck/unix.c:1435 +#: e2fsck/unix.c:1436 #, c-format msgid "\tUsing %s, %s\n" msgstr "" -#: e2fsck/unix.c:1447 +#: e2fsck/unix.c:1448 msgid "need terminal for interactive repairs" msgstr "" -#: e2fsck/unix.c:1508 +#: e2fsck/unix.c:1509 #, c-format msgid "%s: %s trying backup blocks...\n" msgstr "" -#: e2fsck/unix.c:1510 +#: e2fsck/unix.c:1511 msgid "Superblock invalid," msgstr "" -#: e2fsck/unix.c:1511 +#: e2fsck/unix.c:1512 msgid "Group descriptors look bad..." msgstr "" -#: e2fsck/unix.c:1521 +#: e2fsck/unix.c:1522 #, c-format msgid "%s: %s while using the backup blocks" msgstr "" -#: e2fsck/unix.c:1525 +#: e2fsck/unix.c:1526 #, c-format msgid "%s: going back to original superblock\n" msgstr "" -#: e2fsck/unix.c:1554 +#: e2fsck/unix.c:1555 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:1561 +#: e2fsck/unix.c:1562 msgid "Could this be a zero-length partition?\n" msgstr "" -#: e2fsck/unix.c:1563 +#: e2fsck/unix.c:1564 #, c-format msgid "You must have %s access to the filesystem or be root\n" msgstr "" -#: e2fsck/unix.c:1569 +#: e2fsck/unix.c:1570 msgid "Possibly non-existent or swap device?\n" msgstr "" -#: e2fsck/unix.c:1571 +#: e2fsck/unix.c:1572 msgid "Filesystem mounted or opened exclusively by another program?\n" msgstr "" -#: e2fsck/unix.c:1575 +#: e2fsck/unix.c:1576 msgid "Possibly non-existent device?\n" msgstr "" -#: e2fsck/unix.c:1578 +#: e2fsck/unix.c:1579 msgid "" "Disk write-protected; use the -n option to do a read-only\n" "check of the device.\n" msgstr "" -#: e2fsck/unix.c:1592 +#: e2fsck/unix.c:1593 #, c-format msgid "%s: Trying to load superblock despite errors...\n" msgstr "" -#: e2fsck/unix.c:1667 +#: e2fsck/unix.c:1668 msgid "Get a newer version of e2fsck!" msgstr "" -#: e2fsck/unix.c:1711 +#: e2fsck/unix.c:1712 #, c-format msgid "while checking journal for %s" msgstr "" -#: e2fsck/unix.c:1714 +#: e2fsck/unix.c:1715 msgid "Cannot proceed with file system check" msgstr "" -#: e2fsck/unix.c:1725 +#: e2fsck/unix.c:1726 msgid "" "Warning: skipping journal recovery because doing a read-only filesystem " "check.\n" msgstr "" -#: e2fsck/unix.c:1737 +#: e2fsck/unix.c:1738 #, c-format msgid "unable to set superblock flags on %s\n" msgstr "" -#: e2fsck/unix.c:1743 +#: e2fsck/unix.c:1744 #, c-format msgid "Journal checksum error found in %s\n" msgstr "" -#: e2fsck/unix.c:1747 +#: e2fsck/unix.c:1748 #, c-format msgid "Journal corrupted in %s\n" msgstr "" -#: e2fsck/unix.c:1751 +#: e2fsck/unix.c:1752 #, c-format msgid "while recovering journal of %s" msgstr "" -#: e2fsck/unix.c:1773 +#: e2fsck/unix.c:1774 #, c-format msgid "%s has unsupported feature(s):" msgstr "" -#: e2fsck/unix.c:1832 +#: e2fsck/unix.c:1791 +#, c-format +msgid "%s has unsupported encoding: %0x\n" +msgstr "" + +#: e2fsck/unix.c:1842 #, c-format msgid "%s: %s while reading bad blocks inode\n" msgstr "" -#: e2fsck/unix.c:1835 +#: e2fsck/unix.c:1845 msgid "This doesn't bode well, but we'll try to go on...\n" msgstr "" -#: e2fsck/unix.c:1875 +#: e2fsck/unix.c:1885 #, c-format msgid "Creating journal (%d blocks): " msgstr "" -#: e2fsck/unix.c:1885 +#: e2fsck/unix.c:1895 msgid " Done.\n" msgstr "" -#: e2fsck/unix.c:1887 +#: e2fsck/unix.c:1897 msgid "" "\n" "*** journal has been regenerated ***\n" msgstr "" -#: e2fsck/unix.c:1893 +#: e2fsck/unix.c:1903 msgid "aborted" msgstr "" -#: e2fsck/unix.c:1895 +#: e2fsck/unix.c:1905 #, c-format msgid "%s: e2fsck canceled.\n" msgstr "" -#: e2fsck/unix.c:1922 +#: e2fsck/unix.c:1932 msgid "Restarting e2fsck from the beginning...\n" msgstr "" -#: e2fsck/unix.c:1926 +#: e2fsck/unix.c:1936 msgid "while resetting context" msgstr "" -#: e2fsck/unix.c:1985 +#: e2fsck/unix.c:1995 #, c-format msgid "" "\n" "%s: ***** FILE SYSTEM ERRORS CORRECTED *****\n" msgstr "" -#: e2fsck/unix.c:1987 +#: e2fsck/unix.c:1997 #, c-format msgid "%s: File system was modified.\n" msgstr "" -#: e2fsck/unix.c:1991 e2fsck/util.c:71 +#: e2fsck/unix.c:2001 e2fsck/util.c:71 #, c-format msgid "" "\n" "%s: ***** FILE SYSTEM WAS MODIFIED *****\n" msgstr "" -#: e2fsck/unix.c:1996 +#: e2fsck/unix.c:2006 #, c-format msgid "%s: ***** REBOOT SYSTEM *****\n" msgstr "" -#: e2fsck/unix.c:2006 e2fsck/util.c:77 +#: e2fsck/unix.c:2016 e2fsck/util.c:77 #, c-format msgid "" "\n" @@ -3842,68 +3847,68 @@ msgstr "" #: misc/chattr.c:89 #, c-format -msgid "Usage: %s [-pRVf] [-+=aAcCdDeijPsStTu] [-v version] files...\n" +msgid "Usage: %s [-pRVf] [-+=aAcCdDeijPsStTuF] [-v version] files...\n" msgstr "" -#: misc/chattr.c:159 +#: misc/chattr.c:160 #, c-format msgid "bad project - %s\n" msgstr "" -#: misc/chattr.c:173 +#: misc/chattr.c:174 #, c-format msgid "bad version - %s\n" msgstr "" -#: misc/chattr.c:219 misc/lsattr.c:127 +#: misc/chattr.c:220 misc/lsattr.c:127 #, c-format msgid "while trying to stat %s" msgstr "" -#: misc/chattr.c:226 +#: misc/chattr.c:227 #, c-format msgid "while reading flags on %s" msgstr "" -#: misc/chattr.c:231 misc/chattr.c:243 +#: misc/chattr.c:232 misc/chattr.c:244 #, c-format msgid "Flags of %s set as " msgstr "" -#: misc/chattr.c:252 +#: misc/chattr.c:253 #, c-format msgid "while setting flags on %s" msgstr "" -#: misc/chattr.c:260 +#: misc/chattr.c:261 #, c-format msgid "Version of %s set as %lu\n" msgstr "" -#: misc/chattr.c:264 +#: misc/chattr.c:265 #, c-format msgid "while setting version on %s" msgstr "" -#: misc/chattr.c:271 +#: misc/chattr.c:272 #, c-format msgid "Project of %s set as %lu\n" msgstr "" -#: misc/chattr.c:275 +#: misc/chattr.c:276 #, c-format msgid "while setting project on %s" msgstr "" -#: misc/chattr.c:297 +#: misc/chattr.c:298 msgid "Couldn't allocate path variable in chattr_dir_proc" msgstr "" -#: misc/chattr.c:337 +#: misc/chattr.c:338 msgid "= is incompatible with - and +\n" msgstr "" -#: misc/chattr.c:345 +#: misc/chattr.c:346 msgid "Must use '-v', =, - or +\n" msgstr "" @@ -4206,7 +4211,7 @@ msgstr "" msgid "reading MMP block %llu from '%s'\n" msgstr "" -#: misc/dumpe2fs.c:507 misc/mke2fs.c:798 misc/tune2fs.c:2079 +#: misc/dumpe2fs.c:507 misc/mke2fs.c:800 misc/tune2fs.c:2027 msgid "Couldn't allocate memory to parse options!\n" msgstr "" @@ -4234,12 +4239,12 @@ msgid "" "\tblocksize=\n" msgstr "" -#: misc/dumpe2fs.c:649 misc/mke2fs.c:1845 +#: misc/dumpe2fs.c:649 misc/mke2fs.c:1896 #, c-format msgid "\tUsing %s\n" msgstr "" -#: misc/dumpe2fs.c:694 misc/e2image.c:1598 misc/tune2fs.c:2960 +#: misc/dumpe2fs.c:694 misc/e2image.c:1629 misc/tune2fs.c:2913 #: resize/main.c:416 msgid "Couldn't find valid filesystem superblock.\n" msgstr "" @@ -4262,191 +4267,197 @@ msgstr "" #: misc/e2image.c:107 #, c-format -msgid "Usage: %s [ -r|Q ] [ -f ] device image-file\n" +msgid "" +"Usage: %s [ -r|Q ] [ -f ] [ -b superblock ] [ -B blocksize][ -fr ] device " +"image-file\n" msgstr "" -#: misc/e2image.c:109 +#: misc/e2image.c:110 #, c-format msgid " %s -I device image-file\n" msgstr "" -#: misc/e2image.c:110 +#: misc/e2image.c:111 #, c-format msgid "" " %s -ra [ -cfnp ] [ -o src_offset ] [ -O dest_offset ] src_fs " "[ dest_fs ]\n" msgstr "" -#: misc/e2image.c:175 misc/e2image.c:588 misc/e2image.c:594 misc/e2image.c:1193 +#: misc/e2image.c:176 misc/e2image.c:589 misc/e2image.c:595 misc/e2image.c:1194 msgid "while allocating buffer" msgstr "" -#: misc/e2image.c:180 +#: misc/e2image.c:181 #, c-format msgid "Writing block %llu\n" msgstr "" -#: misc/e2image.c:194 +#: misc/e2image.c:195 #, c-format msgid "error writing block %llu" msgstr "" -#: misc/e2image.c:197 +#: misc/e2image.c:198 msgid "error in generic_write()" msgstr "" -#: misc/e2image.c:214 +#: misc/e2image.c:215 msgid "Error: header size is bigger than wrt_size\n" msgstr "" -#: misc/e2image.c:219 +#: misc/e2image.c:220 msgid "Couldn't allocate header buffer\n" msgstr "" -#: misc/e2image.c:247 +#: misc/e2image.c:248 msgid "while writing superblock" msgstr "" -#: misc/e2image.c:256 +#: misc/e2image.c:257 msgid "while writing inode table" msgstr "" -#: misc/e2image.c:264 +#: misc/e2image.c:265 msgid "while writing block bitmap" msgstr "" -#: misc/e2image.c:272 +#: misc/e2image.c:273 msgid "while writing inode bitmap" msgstr "" -#: misc/e2image.c:514 +#: misc/e2image.c:515 #, c-format msgid "Corrupt directory block %llu: bad rec_len (%d)\n" msgstr "" -#: misc/e2image.c:526 +#: misc/e2image.c:527 #, c-format msgid "Corrupt directory block %llu: bad name_len (%d)\n" msgstr "" -#: misc/e2image.c:567 +#: misc/e2image.c:568 #, c-format msgid "%llu / %llu blocks (%d%%)" msgstr "" -#: misc/e2image.c:598 misc/e2image.c:638 +#: misc/e2image.c:599 misc/e2image.c:639 msgid "Copying " msgstr "" -#: misc/e2image.c:635 +#: misc/e2image.c:636 msgid "" "Stopping now will destroy the filesystem, interrupt again if you are sure\n" msgstr "" -#: misc/e2image.c:661 +#: misc/e2image.c:662 #, c-format msgid " %s remaining at %.2f MB/s" msgstr "" -#: misc/e2image.c:673 misc/e2image.c:1203 +#: misc/e2image.c:674 misc/e2image.c:1204 #, c-format msgid "error reading block %llu" msgstr "" -#: misc/e2image.c:727 +#: misc/e2image.c:728 #, c-format msgid "Copied %llu / %llu blocks (%d%%) in %s " msgstr "" -#: misc/e2image.c:731 +#: misc/e2image.c:732 #, c-format msgid "at %.2f MB/s" msgstr "" -#: misc/e2image.c:767 +#: misc/e2image.c:768 msgid "while allocating l1 table" msgstr "" -#: misc/e2image.c:812 +#: misc/e2image.c:813 msgid "while allocating l2 cache" msgstr "" -#: misc/e2image.c:835 +#: misc/e2image.c:836 msgid "" "Warning: There are still tables in the cache while putting the cache, data " "will be lost so the image may not be valid.\n" msgstr "" -#: misc/e2image.c:1160 +#: misc/e2image.c:1161 msgid "while allocating ext2_qcow2_image" msgstr "" -#: misc/e2image.c:1167 +#: misc/e2image.c:1168 msgid "while initializing ext2_qcow2_image" msgstr "" -#: misc/e2image.c:1226 misc/e2image.c:1244 +#: misc/e2image.c:1227 misc/e2image.c:1245 msgid "Programming error: multiple sequential refcount blocks created!\n" msgstr "" -#: misc/e2image.c:1284 +#: misc/e2image.c:1286 msgid "while allocating block bitmap" msgstr "" -#: misc/e2image.c:1293 +#: misc/e2image.c:1295 msgid "while allocating scramble block bitmap" msgstr "" -#: misc/e2image.c:1300 +#: misc/e2image.c:1318 msgid "Scanning inodes...\n" msgstr "" -#: misc/e2image.c:1312 +#: misc/e2image.c:1330 msgid "Can't allocate block buffer" msgstr "" -#: misc/e2image.c:1351 misc/e2image.c:1365 +#: misc/e2image.c:1369 misc/e2image.c:1383 #, c-format msgid "while iterating over inode %u" msgstr "" -#: misc/e2image.c:1397 +#: misc/e2image.c:1415 msgid "Raw and qcow2 images cannot be installed" msgstr "" -#: misc/e2image.c:1419 +#: misc/e2image.c:1437 msgid "error reading bitmaps" msgstr "" -#: misc/e2image.c:1431 +#: misc/e2image.c:1449 msgid "while opening device file" msgstr "" -#: misc/e2image.c:1442 +#: misc/e2image.c:1460 msgid "while restoring the image table" msgstr "" -#: misc/e2image.c:1539 +#: misc/e2image.c:1565 msgid "-a option can only be used with raw or QCOW2 images." msgstr "" -#: misc/e2image.c:1545 +#: misc/e2image.c:1570 +msgid "-b option can only be used with raw or QCOW2 images." +msgstr "" + +#: misc/e2image.c:1576 msgid "Offsets are only allowed with raw images." msgstr "" -#: misc/e2image.c:1550 +#: misc/e2image.c:1581 msgid "Move mode is only allowed with raw images." msgstr "" -#: misc/e2image.c:1555 +#: misc/e2image.c:1586 msgid "Move mode requires all data mode." msgstr "" -#: misc/e2image.c:1565 +#: misc/e2image.c:1596 msgid "checking if mounted" msgstr "" -#: misc/e2image.c:1572 +#: misc/e2image.c:1603 msgid "" "\n" "Running e2image on a R/W mounted filesystem can result in an\n" @@ -4454,51 +4465,51 @@ msgid "" "Use -f option if you really want to do that.\n" msgstr "" -#: misc/e2image.c:1626 +#: misc/e2image.c:1657 msgid "QCOW2 image can not be written to the stdout!\n" msgstr "" -#: misc/e2image.c:1632 +#: misc/e2image.c:1663 msgid "Can not stat output\n" msgstr "" -#: misc/e2image.c:1642 +#: misc/e2image.c:1673 #, c-format msgid "Image (%s) is compressed\n" msgstr "" -#: misc/e2image.c:1645 +#: misc/e2image.c:1676 #, c-format msgid "Image (%s) is encrypted\n" msgstr "" -#: misc/e2image.c:1648 +#: misc/e2image.c:1679 #, c-format msgid "Image (%s) is corrupted\n" msgstr "" -#: misc/e2image.c:1652 +#: misc/e2image.c:1683 #, c-format msgid "while trying to convert qcow2 image (%s) into raw image (%s)" msgstr "" -#: misc/e2image.c:1662 +#: misc/e2image.c:1693 msgid "The -c option only supported in raw mode\n" msgstr "" -#: misc/e2image.c:1667 +#: misc/e2image.c:1698 msgid "The -c option not supported when writing to stdout\n" msgstr "" -#: misc/e2image.c:1674 +#: misc/e2image.c:1705 msgid "while allocating check_buf" msgstr "" -#: misc/e2image.c:1680 +#: misc/e2image.c:1711 msgid "The -p option only supported in raw mode\n" msgstr "" -#: misc/e2image.c:1690 +#: misc/e2image.c:1721 #, c-format msgid "%d blocks already contained the data to be copied\n" msgstr "" @@ -4528,7 +4539,7 @@ msgstr "" msgid "e2label: not an ext2 filesystem\n" msgstr "" -#: misc/e2label.c:97 misc/tune2fs.c:3164 +#: misc/e2label.c:97 misc/tune2fs.c:3117 #, c-format msgid "Warning: label too long, truncating.\n" msgstr "" @@ -4543,7 +4554,7 @@ msgstr "" msgid "e2label: error writing superblock\n" msgstr "" -#: misc/e2label.c:117 misc/tune2fs.c:1739 +#: misc/e2label.c:117 misc/tune2fs.c:1687 #, c-format msgid "Usage: e2label device [newlabel]\n" msgstr "" @@ -4849,51 +4860,51 @@ msgstr "" msgid "%s: too many arguments\n" msgstr "" -#: misc/fuse2fs.c:3739 +#: misc/fuse2fs.c:3745 msgid "Mounting read-only.\n" msgstr "" -#: misc/fuse2fs.c:3763 +#: misc/fuse2fs.c:3769 #, c-format msgid "%s: Allowing users to allocate all blocks. This is dangerous!\n" msgstr "" -#: misc/fuse2fs.c:3775 misc/fuse2fs.c:3789 +#: misc/fuse2fs.c:3781 misc/fuse2fs.c:3795 #, c-format msgid "%s: %s.\n" msgstr "" -#: misc/fuse2fs.c:3776 misc/fuse2fs.c:3791 misc/tune2fs.c:3060 +#: misc/fuse2fs.c:3782 misc/fuse2fs.c:3797 misc/tune2fs.c:3013 #, c-format msgid "Please run e2fsck -fy %s.\n" msgstr "" -#: misc/fuse2fs.c:3798 +#: misc/fuse2fs.c:3804 msgid "Journal needs recovery; running `e2fsck -E journal_only' is required.\n" msgstr "" -#: misc/fuse2fs.c:3806 +#: misc/fuse2fs.c:3812 #, c-format msgid "%s: Writing to the journal is not supported.\n" msgstr "" -#: misc/fuse2fs.c:3821 +#: misc/fuse2fs.c:3827 msgid "Warning: Mounting unchecked fs, running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3825 +#: misc/fuse2fs.c:3831 msgid "Warning: Maximal mount count reached, running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3830 +#: misc/fuse2fs.c:3836 msgid "Warning: Check time reached; running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3834 +#: misc/fuse2fs.c:3840 msgid "Orphans detected; running e2fsck is recommended.\n" msgstr "" -#: misc/fuse2fs.c:3838 +#: misc/fuse2fs.c:3844 msgid "Errors detected; running e2fsck is required.\n" msgstr "" @@ -4986,7 +4997,7 @@ msgid "" "Could not write %d blocks in inode table starting at %llu: %s\n" msgstr "" -#: misc/mke2fs.c:456 misc/mke2fs.c:2726 misc/mke2fs.c:3131 +#: misc/mke2fs.c:456 misc/mke2fs.c:2807 misc/mke2fs.c:3212 msgid "done \n" msgstr "" @@ -5151,70 +5162,75 @@ msgstr "" msgid "Superblock backups stored on blocks: " msgstr "" -#: misc/mke2fs.c:820 +#: misc/mke2fs.c:822 #, c-format msgid "%s requires '-O 64bit'\n" msgstr "" -#: misc/mke2fs.c:826 +#: misc/mke2fs.c:828 #, c-format msgid "'%s' must be before 'resize=%u'\n" msgstr "" -#: misc/mke2fs.c:839 +#: misc/mke2fs.c:841 #, c-format msgid "Invalid desc_size: '%s'\n" msgstr "" -#: misc/mke2fs.c:853 +#: misc/mke2fs.c:855 #, c-format msgid "Invalid hash seed: %s\n" msgstr "" -#: misc/mke2fs.c:865 +#: misc/mke2fs.c:867 #, c-format msgid "Invalid offset: %s\n" msgstr "" -#: misc/mke2fs.c:879 misc/tune2fs.c:2107 +#: misc/mke2fs.c:881 misc/tune2fs.c:2055 #, c-format msgid "Invalid mmp_update_interval: %s\n" msgstr "" -#: misc/mke2fs.c:896 +#: misc/mke2fs.c:898 #, c-format msgid "Invalid # of backup superblocks: %s\n" msgstr "" -#: misc/mke2fs.c:918 +#: misc/mke2fs.c:920 #, c-format msgid "Invalid stride parameter: %s\n" msgstr "" -#: misc/mke2fs.c:933 +#: misc/mke2fs.c:935 #, c-format msgid "Invalid stripe-width parameter: %s\n" msgstr "" -#: misc/mke2fs.c:956 +#: misc/mke2fs.c:958 #, c-format msgid "Invalid resize parameter: %s\n" msgstr "" -#: misc/mke2fs.c:963 +#: misc/mke2fs.c:965 msgid "The resize maximum must be greater than the filesystem size.\n" msgstr "" -#: misc/mke2fs.c:987 +#: misc/mke2fs.c:989 msgid "On-line resizing not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:1013 misc/mke2fs.c:1022 +#: misc/mke2fs.c:1015 misc/mke2fs.c:1024 #, c-format msgid "Invalid root_owner: '%s'\n" msgstr "" -#: misc/mke2fs.c:1065 +#: misc/mke2fs.c:1074 +#, c-format +msgid "Invalid encoding: %s" +msgstr "" + +#: misc/mke2fs.c:1092 #, c-format msgid "" "\n" @@ -5237,11 +5253,13 @@ msgid "" "\ttest_fs\n" "\tdiscard\n" "\tnodiscard\n" +"\tfname_encoding=\n" +"\tfname_encoding_flags=\n" "\tquotatype=\n" "\n" msgstr "" -#: misc/mke2fs.c:1090 +#: misc/mke2fs.c:1119 #, c-format msgid "" "\n" @@ -5249,41 +5267,53 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:1135 +#: misc/mke2fs.c:1130 +#, c-format +msgid "error: Invalid encoding flag: %s\n" +msgstr "" + +#: misc/mke2fs.c:1136 +#, c-format +msgid "" +"error: An encoding must be explicitly specified when passing encoding-" +"flags\n" +msgstr "" + +#: misc/mke2fs.c:1184 #, c-format msgid "" "Syntax error in mke2fs config file (%s, line #%d)\n" "\t%s\n" msgstr "" -#: misc/mke2fs.c:1148 misc/tune2fs.c:1126 +#: misc/mke2fs.c:1197 misc/tune2fs.c:1068 #, c-format msgid "Invalid filesystem option set: %s\n" msgstr "" -#: misc/mke2fs.c:1160 misc/tune2fs.c:417 +#: misc/mke2fs.c:1209 misc/tune2fs.c:417 #, c-format msgid "Invalid mount option set: %s\n" msgstr "" -#: misc/mke2fs.c:1296 +#: misc/mke2fs.c:1345 #, c-format msgid "" "\n" "Your mke2fs.conf file does not define the %s filesystem type.\n" msgstr "" -#: misc/mke2fs.c:1300 +#: misc/mke2fs.c:1349 msgid "" "You probably need to install an updated mke2fs.conf file.\n" "\n" msgstr "" -#: misc/mke2fs.c:1304 +#: misc/mke2fs.c:1353 msgid "Aborting...\n" msgstr "" -#: misc/mke2fs.c:1345 +#: misc/mke2fs.c:1394 #, c-format msgid "" "\n" @@ -5291,154 +5321,154 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:1527 +#: misc/mke2fs.c:1578 msgid "Couldn't allocate memory for new PATH.\n" msgstr "" -#: misc/mke2fs.c:1564 +#: misc/mke2fs.c:1615 #, c-format msgid "Couldn't init profile successfully (error: %ld).\n" msgstr "" -#: misc/mke2fs.c:1597 +#: misc/mke2fs.c:1648 #, c-format msgid "invalid block size - %s" msgstr "" -#: misc/mke2fs.c:1601 +#: misc/mke2fs.c:1652 #, c-format msgid "Warning: blocksize %d not usable on most systems.\n" msgstr "" -#: misc/mke2fs.c:1617 +#: misc/mke2fs.c:1668 #, c-format msgid "invalid cluster size - %s" msgstr "" -#: misc/mke2fs.c:1630 +#: misc/mke2fs.c:1681 msgid "'-R' is deprecated, use '-E' instead" msgstr "" -#: misc/mke2fs.c:1644 misc/tune2fs.c:1836 +#: misc/mke2fs.c:1695 misc/tune2fs.c:1784 #, c-format msgid "bad error behavior - %s" msgstr "" -#: misc/mke2fs.c:1656 +#: misc/mke2fs.c:1707 msgid "Illegal number for blocks per group" msgstr "" -#: misc/mke2fs.c:1661 +#: misc/mke2fs.c:1712 msgid "blocks per group must be multiple of 8" msgstr "" -#: misc/mke2fs.c:1669 +#: misc/mke2fs.c:1720 msgid "Illegal number for flex_bg size" msgstr "" -#: misc/mke2fs.c:1675 +#: misc/mke2fs.c:1726 msgid "flex_bg size must be a power of 2" msgstr "" -#: misc/mke2fs.c:1680 +#: misc/mke2fs.c:1731 #, c-format msgid "flex_bg size (%lu) must be less than or equal to 2^31" msgstr "" -#: misc/mke2fs.c:1690 +#: misc/mke2fs.c:1741 #, c-format msgid "invalid inode ratio %s (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:1700 +#: misc/mke2fs.c:1751 #, c-format msgid "invalid inode size - %s" msgstr "" -#: misc/mke2fs.c:1713 +#: misc/mke2fs.c:1764 msgid "" "Warning: -K option is deprecated and should not be used anymore. Use '-E " "nodiscard' extended option instead!\n" msgstr "" -#: misc/mke2fs.c:1724 +#: misc/mke2fs.c:1775 msgid "in malloc for bad_blocks_filename" msgstr "" -#: misc/mke2fs.c:1733 +#: misc/mke2fs.c:1784 #, c-format msgid "" "Warning: label too long; will be truncated to '%s'\n" "\n" msgstr "" -#: misc/mke2fs.c:1742 +#: misc/mke2fs.c:1793 #, c-format msgid "invalid reserved blocks percent - %s" msgstr "" -#: misc/mke2fs.c:1757 +#: misc/mke2fs.c:1808 #, c-format msgid "bad num inodes - %s" msgstr "" -#: misc/mke2fs.c:1770 +#: misc/mke2fs.c:1821 msgid "while allocating fs_feature string" msgstr "" -#: misc/mke2fs.c:1787 +#: misc/mke2fs.c:1838 #, c-format msgid "bad revision level - %s" msgstr "" -#: misc/mke2fs.c:1792 +#: misc/mke2fs.c:1843 #, c-format msgid "while trying to create revision %d" msgstr "" -#: misc/mke2fs.c:1806 +#: misc/mke2fs.c:1857 msgid "The -t option may only be used once" msgstr "" -#: misc/mke2fs.c:1814 +#: misc/mke2fs.c:1865 msgid "The -T option may only be used once" msgstr "" -#: misc/mke2fs.c:1870 misc/mke2fs.c:3215 +#: misc/mke2fs.c:1921 misc/mke2fs.c:3296 #, c-format msgid "while trying to open journal device %s\n" msgstr "" -#: misc/mke2fs.c:1876 +#: misc/mke2fs.c:1927 #, c-format msgid "Journal dev blocksize (%d) smaller than minimum blocksize %d\n" msgstr "" -#: misc/mke2fs.c:1882 +#: misc/mke2fs.c:1933 #, c-format msgid "Using journal device's blocksize: %d\n" msgstr "" -#: misc/mke2fs.c:1893 +#: misc/mke2fs.c:1944 #, c-format msgid "invalid blocks '%s' on device '%s'" msgstr "" -#: misc/mke2fs.c:1923 +#: misc/mke2fs.c:1974 msgid "filesystem" msgstr "" -#: misc/mke2fs.c:1941 resize/main.c:497 +#: misc/mke2fs.c:1992 resize/main.c:497 msgid "while trying to determine filesystem size" msgstr "" -#: misc/mke2fs.c:1947 +#: misc/mke2fs.c:1998 msgid "" "Couldn't determine device size; you must specify\n" "the size of the filesystem\n" msgstr "" -#: misc/mke2fs.c:1954 +#: misc/mke2fs.c:2005 msgid "" "Device size reported to be zero. Invalid partition specified, or\n" "\tpartition table wasn't reread after running fdisk, due to\n" @@ -5446,132 +5476,144 @@ msgid "" "\tto re-read your partition table.\n" msgstr "" -#: misc/mke2fs.c:1971 +#: misc/mke2fs.c:2022 msgid "Filesystem larger than apparent device size." msgstr "" -#: misc/mke2fs.c:1991 +#: misc/mke2fs.c:2042 msgid "Failed to parse fs types list\n" msgstr "" -#: misc/mke2fs.c:2040 +#: misc/mke2fs.c:2092 msgid "The HURD does not support the filetype feature.\n" msgstr "" -#: misc/mke2fs.c:2045 +#: misc/mke2fs.c:2097 msgid "The HURD does not support the huge_file feature.\n" msgstr "" -#: misc/mke2fs.c:2050 +#: misc/mke2fs.c:2102 msgid "The HURD does not support the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:2055 +#: misc/mke2fs.c:2107 msgid "The HURD does not support the ea_inode feature.\n" msgstr "" -#: misc/mke2fs.c:2065 +#: misc/mke2fs.c:2117 msgid "while trying to determine hardware sector size" msgstr "" -#: misc/mke2fs.c:2071 +#: misc/mke2fs.c:2123 msgid "while trying to determine physical sector size" msgstr "" -#: misc/mke2fs.c:2103 +#: misc/mke2fs.c:2155 msgid "while setting blocksize; too small for device\n" msgstr "" -#: misc/mke2fs.c:2108 +#: misc/mke2fs.c:2160 #, c-format msgid "" "Warning: specified blocksize %d is less than device physical sectorsize %d\n" msgstr "" -#: misc/mke2fs.c:2132 +#: misc/mke2fs.c:2184 #, c-format msgid "" "%s: Size of device (0x%llx blocks) %s too big to be expressed\n" "\tin 32 bits using a blocksize of %d.\n" msgstr "" -#: misc/mke2fs.c:2144 +#: misc/mke2fs.c:2196 #, c-format msgid "" "%s: Size of device (0x%llx blocks) %s too big to create\n" "\ta filesystem using a blocksize of %d.\n" msgstr "" -#: misc/mke2fs.c:2166 +#: misc/mke2fs.c:2218 msgid "fs_types for mke2fs.conf resolution: " msgstr "" -#: misc/mke2fs.c:2173 +#: misc/mke2fs.c:2225 msgid "Filesystem features not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2181 +#: misc/mke2fs.c:2233 msgid "Sparse superblocks not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2191 +#: misc/mke2fs.c:2243 msgid "Journals not supported with revision 0 filesystems\n" msgstr "" -#: misc/mke2fs.c:2204 +#: misc/mke2fs.c:2256 #, c-format msgid "invalid reserved blocks percent - %lf" msgstr "" -#: misc/mke2fs.c:2221 +#: misc/mke2fs.c:2273 msgid "" "Extents MUST be enabled for a 64-bit filesystem. Pass -O extents to " "rectify.\n" msgstr "" -#: misc/mke2fs.c:2241 +#: misc/mke2fs.c:2293 msgid "The cluster size may not be smaller than the block size.\n" msgstr "" -#: misc/mke2fs.c:2247 +#: misc/mke2fs.c:2299 msgid "specifying a cluster size requires the bigalloc feature" msgstr "" -#: misc/mke2fs.c:2267 +#: misc/mke2fs.c:2319 #, c-format msgid "warning: Unable to get device geometry for %s\n" msgstr "" -#: misc/mke2fs.c:2270 +#: misc/mke2fs.c:2322 #, c-format msgid "%s alignment is offset by %lu bytes.\n" msgstr "" -#: misc/mke2fs.c:2272 +#: misc/mke2fs.c:2324 #, c-format msgid "" "This may result in very poor performance, (re)-partitioning suggested.\n" msgstr "" -#: misc/mke2fs.c:2293 +#: misc/mke2fs.c:2345 #, c-format msgid "%d-byte blocks too big for system (max %d)" msgstr "" -#: misc/mke2fs.c:2297 +#: misc/mke2fs.c:2349 #, c-format msgid "" "Warning: %d-byte blocks too big for system (max %d), forced to continue\n" msgstr "" -#: misc/mke2fs.c:2305 +#: misc/mke2fs.c:2357 #, c-format msgid "" "Suggestion: Use Linux kernel >= 3.18 for improved stability of the metadata " "and journal checksum features.\n" msgstr "" -#: misc/mke2fs.c:2360 +#: misc/mke2fs.c:2401 +msgid "" +"Filename encoding type must be specified\n" +"Use -E fname_encoding= instead" +msgstr "" + +#: misc/mke2fs.c:2408 +msgid "" +"Unknown default filename encoding\n" +"Use -E fname_encoding= instead" +msgstr "" + +#: misc/mke2fs.c:2432 #, c-format msgid "" "\n" @@ -5581,22 +5623,28 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:2375 +#: misc/mke2fs.c:2447 #, c-format msgid "%d byte inodes are too small for project quota" msgstr "" -#: misc/mke2fs.c:2397 +#: misc/mke2fs.c:2463 +msgid "" +"The encrypt and encoding features are not compatible.\n" +"They can not be both enabled simultaneously.\n" +msgstr "" + +#: misc/mke2fs.c:2478 msgid "Can't support bigalloc feature without extents feature" msgstr "" -#: misc/mke2fs.c:2404 +#: misc/mke2fs.c:2485 msgid "" "The resize_inode and meta_bg features are not compatible.\n" "They can not be both enabled simultaneously.\n" msgstr "" -#: misc/mke2fs.c:2412 +#: misc/mke2fs.c:2493 msgid "" "\n" "Warning: the bigalloc feature is still under development\n" @@ -5604,39 +5652,39 @@ msgid "" "\n" msgstr "" -#: misc/mke2fs.c:2424 +#: misc/mke2fs.c:2505 msgid "reserved online resize blocks not supported on non-sparse filesystem" msgstr "" -#: misc/mke2fs.c:2433 +#: misc/mke2fs.c:2514 msgid "blocks per group count out of range" msgstr "" -#: misc/mke2fs.c:2455 +#: misc/mke2fs.c:2536 msgid "Flex_bg feature not enabled, so flex_bg size may not be specified" msgstr "" -#: misc/mke2fs.c:2467 +#: misc/mke2fs.c:2548 #, c-format msgid "invalid inode size %d (min %d/max %d)" msgstr "" -#: misc/mke2fs.c:2482 +#: misc/mke2fs.c:2563 #, c-format msgid "%d byte inodes are too small for inline data; specify larger size" msgstr "" -#: misc/mke2fs.c:2497 +#: misc/mke2fs.c:2578 #, c-format msgid "too many inodes (%llu), raise inode ratio?" msgstr "" -#: misc/mke2fs.c:2504 +#: misc/mke2fs.c:2585 #, c-format msgid "too many inodes (%llu), specify < 2^32 inodes" msgstr "" -#: misc/mke2fs.c:2518 +#: misc/mke2fs.c:2599 #, c-format msgid "" "inode_size (%u) * inodes_count (%u) too big for a\n" @@ -5644,153 +5692,153 @@ msgid "" "\tor lower inode count (-N).\n" msgstr "" -#: misc/mke2fs.c:2705 +#: misc/mke2fs.c:2786 msgid "Discarding device blocks: " msgstr "" -#: misc/mke2fs.c:2721 +#: misc/mke2fs.c:2802 msgid "failed - " msgstr "" -#: misc/mke2fs.c:2780 +#: misc/mke2fs.c:2861 msgid "while initializing quota context" msgstr "" -#: misc/mke2fs.c:2787 +#: misc/mke2fs.c:2868 msgid "while writing quota inodes" msgstr "" -#: misc/mke2fs.c:2812 +#: misc/mke2fs.c:2893 #, c-format msgid "bad error behavior in profile - %s" msgstr "" -#: misc/mke2fs.c:2888 +#: misc/mke2fs.c:2969 msgid "in malloc for android_sparse_params" msgstr "" -#: misc/mke2fs.c:2902 +#: misc/mke2fs.c:2983 msgid "while setting up superblock" msgstr "" -#: misc/mke2fs.c:2918 +#: misc/mke2fs.c:2999 msgid "" "Extents are not enabled. The file extent tree can be checksummed, whereas " "block maps cannot. Not enabling extents reduces the coverage of metadata " "checksumming. Pass -O extents to rectify.\n" msgstr "" -#: misc/mke2fs.c:2925 +#: misc/mke2fs.c:3006 msgid "" "64-bit filesystem support is not enabled. The larger fields afforded by " "this feature enable full-strength checksumming. Pass -O 64bit to rectify.\n" msgstr "" -#: misc/mke2fs.c:2933 +#: misc/mke2fs.c:3014 msgid "The metadata_csum_seed feature requires the metadata_csum feature.\n" msgstr "" -#: misc/mke2fs.c:2957 +#: misc/mke2fs.c:3038 msgid "Discard succeeded and will return 0s - skipping inode table wipe\n" msgstr "" -#: misc/mke2fs.c:3056 +#: misc/mke2fs.c:3137 #, c-format msgid "unknown os - %s" msgstr "" -#: misc/mke2fs.c:3119 +#: misc/mke2fs.c:3200 msgid "Allocating group tables: " msgstr "" -#: misc/mke2fs.c:3127 +#: misc/mke2fs.c:3208 msgid "while trying to allocate filesystem tables" msgstr "" -#: misc/mke2fs.c:3136 +#: misc/mke2fs.c:3217 msgid "" "\n" "\twhile converting subcluster bitmap" msgstr "" -#: misc/mke2fs.c:3142 +#: misc/mke2fs.c:3223 #, c-format msgid "%s may be further corrupted by superblock rewrite\n" msgstr "" -#: misc/mke2fs.c:3183 +#: misc/mke2fs.c:3264 #, c-format msgid "while zeroing block %llu at end of filesystem" msgstr "" -#: misc/mke2fs.c:3196 +#: misc/mke2fs.c:3277 msgid "while reserving blocks for online resize" msgstr "" -#: misc/mke2fs.c:3208 misc/tune2fs.c:1544 +#: misc/mke2fs.c:3289 misc/tune2fs.c:1492 msgid "journal" msgstr "" -#: misc/mke2fs.c:3220 +#: misc/mke2fs.c:3301 #, c-format msgid "Adding journal to device %s: " msgstr "" -#: misc/mke2fs.c:3227 +#: misc/mke2fs.c:3308 #, c-format msgid "" "\n" "\twhile trying to add journal to device %s" msgstr "" -#: misc/mke2fs.c:3232 misc/mke2fs.c:3261 misc/mke2fs.c:3299 -#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1573 misc/tune2fs.c:1592 +#: misc/mke2fs.c:3313 misc/mke2fs.c:3342 misc/mke2fs.c:3380 +#: misc/mk_hugefiles.c:600 misc/tune2fs.c:1521 misc/tune2fs.c:1540 msgid "done\n" msgstr "" -#: misc/mke2fs.c:3238 +#: misc/mke2fs.c:3319 msgid "Skipping journal creation in super-only mode\n" msgstr "" -#: misc/mke2fs.c:3248 +#: misc/mke2fs.c:3329 #, c-format msgid "Creating journal (%u blocks): " msgstr "" -#: misc/mke2fs.c:3257 +#: misc/mke2fs.c:3338 msgid "" "\n" "\twhile trying to create journal" msgstr "" -#: misc/mke2fs.c:3269 misc/tune2fs.c:1191 +#: misc/mke2fs.c:3350 misc/tune2fs.c:1133 msgid "" "\n" "Error while enabling multiple mount protection feature." msgstr "" -#: misc/mke2fs.c:3274 +#: misc/mke2fs.c:3355 #, c-format msgid "Multiple mount protection is enabled with update interval %d seconds.\n" msgstr "" -#: misc/mke2fs.c:3290 +#: misc/mke2fs.c:3371 msgid "Copying files into the device: " msgstr "" -#: misc/mke2fs.c:3296 +#: misc/mke2fs.c:3377 msgid "while populating file system" msgstr "" -#: misc/mke2fs.c:3303 +#: misc/mke2fs.c:3384 msgid "Writing superblocks and filesystem accounting information: " msgstr "" -#: misc/mke2fs.c:3310 +#: misc/mke2fs.c:3391 msgid "while writing out and closing file system" msgstr "" -#: misc/mke2fs.c:3313 +#: misc/mke2fs.c:3394 msgid "" "done\n" "\n" @@ -5895,19 +5943,19 @@ msgstr "" msgid "while trying to open external journal" msgstr "" -#: misc/tune2fs.c:287 misc/tune2fs.c:2851 +#: misc/tune2fs.c:287 misc/tune2fs.c:2804 #, c-format msgid "%s is not a journal device.\n" msgstr "" -#: misc/tune2fs.c:296 misc/tune2fs.c:2860 +#: misc/tune2fs.c:296 misc/tune2fs.c:2813 #, c-format msgid "" "Journal superblock is corrupted, nr_users\n" "is too high (%d).\n" msgstr "" -#: misc/tune2fs.c:303 misc/tune2fs.c:2867 +#: misc/tune2fs.c:303 misc/tune2fs.c:2820 msgid "Filesystem's UUID not found on journal device.\n" msgstr "" @@ -5962,207 +6010,213 @@ msgstr "" msgid "' to disable 64-bit mode.\n" msgstr "" -#: misc/tune2fs.c:1093 +#: misc/tune2fs.c:1035 msgid "" "WARNING: Could not confirm kernel support for metadata_csum_seed.\n" " This requires Linux >= v4.4.\n" msgstr "" -#: misc/tune2fs.c:1129 +#: misc/tune2fs.c:1071 #, c-format msgid "Clearing filesystem feature '%s' not supported.\n" msgstr "" -#: misc/tune2fs.c:1135 +#: misc/tune2fs.c:1077 #, c-format msgid "Setting filesystem feature '%s' not supported.\n" msgstr "" -#: misc/tune2fs.c:1144 +#: misc/tune2fs.c:1086 msgid "" "The has_journal feature may only be cleared when the filesystem is\n" "unmounted or mounted read-only.\n" msgstr "" -#: misc/tune2fs.c:1152 +#: misc/tune2fs.c:1094 msgid "" "The needs_recovery flag is set. Please run e2fsck before clearing\n" "the has_journal flag.\n" msgstr "" -#: misc/tune2fs.c:1170 +#: misc/tune2fs.c:1112 msgid "" "Setting filesystem feature 'sparse_super' not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1183 +#: misc/tune2fs.c:1125 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:1201 +#: misc/tune2fs.c:1143 #, c-format msgid "Multiple mount protection has been enabled with update interval %ds.\n" msgstr "" -#: misc/tune2fs.c:1210 +#: misc/tune2fs.c:1152 msgid "" "The multiple mount protection feature cannot\n" "be disabled if the filesystem is readonly.\n" msgstr "" -#: misc/tune2fs.c:1218 +#: misc/tune2fs.c:1160 msgid "Error while reading bitmaps\n" msgstr "" -#: misc/tune2fs.c:1227 +#: misc/tune2fs.c:1169 #, c-format msgid "Magic number in MMP block does not match. expected: %x, actual: %x\n" msgstr "" -#: misc/tune2fs.c:1232 +#: misc/tune2fs.c:1174 msgid "while reading MMP block." msgstr "" -#: misc/tune2fs.c:1264 +#: misc/tune2fs.c:1206 msgid "" "Clearing the flex_bg flag would cause the the filesystem to be\n" "inconsistent.\n" msgstr "" -#: misc/tune2fs.c:1275 +#: misc/tune2fs.c:1217 msgid "" "The huge_file feature may only be cleared when the filesystem is\n" "unmounted or mounted read-only.\n" msgstr "" -#: misc/tune2fs.c:1286 +#: misc/tune2fs.c:1228 msgid "Enabling checksums could take some time." msgstr "" -#: misc/tune2fs.c:1288 +#: misc/tune2fs.c:1230 msgid "Cannot enable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1294 +#: misc/tune2fs.c:1236 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:1243 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:1269 msgid "Disabling checksums could take some time." msgstr "" -#: misc/tune2fs.c:1329 +#: misc/tune2fs.c:1271 msgid "Cannot disable metadata_csum on a mounted filesystem!\n" msgstr "" -#: misc/tune2fs.c:1392 +#: misc/tune2fs.c:1334 #, c-format msgid "Cannot enable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1402 +#: misc/tune2fs.c:1344 #, c-format msgid "Cannot disable 64-bit mode while mounted!\n" msgstr "" -#: misc/tune2fs.c:1432 +#: misc/tune2fs.c:1374 #, c-format msgid "Cannot enable project feature; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1453 +#: misc/tune2fs.c:1395 msgid "" "\n" "Warning: '^quota' option overrides '-Q'arguments.\n" msgstr "" -#: misc/tune2fs.c:1471 +#: misc/tune2fs.c:1405 +msgid "" +"Cannot enable encrypt feature on filesystems with the encoding feature " +"enabled.\n" +msgstr "" + +#: misc/tune2fs.c:1419 msgid "" "Setting feature 'metadata_csum_seed' is only supported\n" "on filesystems with the metadata_csum feature enabled.\n" msgstr "" -#: misc/tune2fs.c:1489 +#: misc/tune2fs.c:1437 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:1495 +#: misc/tune2fs.c:1443 msgid "Recalculating checksums could take some time." msgstr "" -#: misc/tune2fs.c:1537 +#: misc/tune2fs.c:1485 msgid "The filesystem already has a journal.\n" msgstr "" -#: misc/tune2fs.c:1557 +#: misc/tune2fs.c:1505 #, c-format msgid "" "\n" "\twhile trying to open journal on %s\n" msgstr "" -#: misc/tune2fs.c:1561 +#: misc/tune2fs.c:1509 #, c-format msgid "Creating journal on device %s: " msgstr "" -#: misc/tune2fs.c:1569 +#: misc/tune2fs.c:1517 #, c-format msgid "while adding filesystem to journal on %s" msgstr "" -#: misc/tune2fs.c:1575 +#: misc/tune2fs.c:1523 msgid "Creating journal inode: " msgstr "" -#: misc/tune2fs.c:1589 +#: misc/tune2fs.c:1537 msgid "" "\n" "\twhile trying to create journal file" msgstr "" -#: misc/tune2fs.c:1627 +#: misc/tune2fs.c:1575 #, c-format msgid "Cannot enable project quota; inode size too small.\n" msgstr "" -#: misc/tune2fs.c:1640 +#: misc/tune2fs.c:1588 msgid "while initializing quota context in support library" msgstr "" -#: misc/tune2fs.c:1655 +#: misc/tune2fs.c:1603 #, c-format msgid "while updating quota limits (%d)" msgstr "" -#: misc/tune2fs.c:1663 +#: misc/tune2fs.c:1611 #, c-format msgid "while writing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1681 +#: misc/tune2fs.c:1629 #, c-format msgid "while removing quota file (%d)" msgstr "" -#: misc/tune2fs.c:1724 +#: misc/tune2fs.c:1672 msgid "" "\n" "Bad quota options specified.\n" @@ -6176,65 +6230,65 @@ msgid "" "\n" msgstr "" -#: misc/tune2fs.c:1782 +#: misc/tune2fs.c:1730 #, c-format msgid "Couldn't parse date/time specifier: %s" msgstr "" -#: misc/tune2fs.c:1807 misc/tune2fs.c:1820 +#: misc/tune2fs.c:1755 misc/tune2fs.c:1768 #, c-format msgid "bad mounts count - %s" msgstr "" -#: misc/tune2fs.c:1863 +#: misc/tune2fs.c:1811 #, c-format msgid "bad gid/group name - %s" msgstr "" -#: misc/tune2fs.c:1896 +#: misc/tune2fs.c:1844 #, c-format msgid "bad interval - %s" msgstr "" -#: misc/tune2fs.c:1925 +#: misc/tune2fs.c:1873 #, c-format msgid "bad reserved block ratio - %s" msgstr "" -#: misc/tune2fs.c:1940 +#: misc/tune2fs.c:1888 msgid "-o may only be specified once" msgstr "" -#: misc/tune2fs.c:1949 +#: misc/tune2fs.c:1897 msgid "-O may only be specified once" msgstr "" -#: misc/tune2fs.c:1966 +#: misc/tune2fs.c:1914 #, c-format msgid "bad reserved blocks count - %s" msgstr "" -#: misc/tune2fs.c:1995 +#: misc/tune2fs.c:1943 #, c-format msgid "bad uid/user name - %s" msgstr "" -#: misc/tune2fs.c:2012 +#: misc/tune2fs.c:1960 #, c-format msgid "bad inode size - %s" msgstr "" -#: misc/tune2fs.c:2019 +#: misc/tune2fs.c:1967 #, c-format msgid "Inode size must be a power of two- %s" msgstr "" -#: misc/tune2fs.c:2116 +#: misc/tune2fs.c:2064 #, c-format msgid "mmp_update_interval too big: %lu\n" msgstr "" -#: misc/tune2fs.c:2121 +#: misc/tune2fs.c:2069 #, c-format msgid "Setting multiple mount protection update interval to %lu second\n" msgid_plural "" @@ -6242,27 +6296,32 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: misc/tune2fs.c:2144 +#: misc/tune2fs.c:2078 +#, c-format +msgid "Setting filesystem error flag to force fsck.\n" +msgstr "" + +#: misc/tune2fs.c:2096 #, c-format msgid "Invalid RAID stride: %s\n" msgstr "" -#: misc/tune2fs.c:2159 +#: misc/tune2fs.c:2111 #, c-format msgid "Invalid RAID stripe-width: %s\n" msgstr "" -#: misc/tune2fs.c:2174 +#: misc/tune2fs.c:2126 #, c-format msgid "Invalid hash algorithm: %s\n" msgstr "" -#: misc/tune2fs.c:2180 +#: misc/tune2fs.c:2132 #, c-format msgid "Setting default hash algorithm to %s (%d)\n" msgstr "" -#: misc/tune2fs.c:2199 +#: misc/tune2fs.c:2151 msgid "" "\n" "Bad options specified.\n" @@ -6277,76 +6336,77 @@ msgid "" "\tmmp_update_interval=\n" "\tstride=\n" "\tstripe_width=\n" +"\tforce_fsck\n" "\ttest_fs\n" "\t^test_fs\n" msgstr "" -#: misc/tune2fs.c:2669 +#: misc/tune2fs.c:2622 msgid "Failed to read inode bitmap\n" msgstr "" -#: misc/tune2fs.c:2674 +#: misc/tune2fs.c:2627 msgid "Failed to read block bitmap\n" msgstr "" -#: misc/tune2fs.c:2691 resize/resize2fs.c:1277 +#: misc/tune2fs.c:2644 resize/resize2fs.c:1277 msgid "blocks to be moved" msgstr "" -#: misc/tune2fs.c:2694 +#: misc/tune2fs.c:2647 msgid "Failed to allocate block bitmap when increasing inode size\n" msgstr "" -#: misc/tune2fs.c:2700 +#: misc/tune2fs.c:2653 msgid "Not enough space to increase inode size \n" msgstr "" -#: misc/tune2fs.c:2705 +#: misc/tune2fs.c:2658 msgid "Failed to relocate blocks during inode resize \n" msgstr "" -#: misc/tune2fs.c:2737 +#: misc/tune2fs.c:2690 msgid "" "Error in resizing the inode size.\n" "Run e2undo to undo the file system changes. \n" msgstr "" -#: misc/tune2fs.c:2947 +#: misc/tune2fs.c:2900 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:2954 +#: misc/tune2fs.c:2907 #, c-format msgid "" "MMP block magic is bad. Try to fix it by running:\n" "'e2fsck -f %s'\n" msgstr "" -#: misc/tune2fs.c:2966 +#: misc/tune2fs.c:2919 msgid "Cannot modify a journal device.\n" msgstr "" -#: misc/tune2fs.c:2979 +#: misc/tune2fs.c:2932 #, c-format msgid "The inode size is already %lu\n" msgstr "" -#: misc/tune2fs.c:2986 +#: misc/tune2fs.c:2939 msgid "Shrinking inode size is not supported\n" msgstr "" -#: misc/tune2fs.c:2991 +#: misc/tune2fs.c:2944 #, c-format msgid "Invalid inode size %lu (max %d)\n" msgstr "" -#: misc/tune2fs.c:2997 +#: misc/tune2fs.c:2950 msgid "Resizing inodes could take some time." msgstr "" -#: misc/tune2fs.c:3045 +#: misc/tune2fs.c:2998 #, c-format msgid "" "Warning: The journal is dirty. You may wish to replay the journal like:\n" @@ -6357,153 +6417,153 @@ msgid "" "by journal recovery.\n" msgstr "" -#: misc/tune2fs.c:3056 +#: misc/tune2fs.c:3009 #, c-format msgid "Recovering journal.\n" msgstr "" -#: misc/tune2fs.c:3075 +#: misc/tune2fs.c:3028 #, c-format msgid "Setting maximal mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3081 +#: misc/tune2fs.c:3034 #, c-format msgid "Setting current mount count to %d\n" msgstr "" -#: misc/tune2fs.c:3086 +#: misc/tune2fs.c:3039 #, c-format msgid "Setting error behavior to %d\n" msgstr "" -#: misc/tune2fs.c:3091 +#: misc/tune2fs.c:3044 #, c-format msgid "Setting reserved blocks gid to %lu\n" msgstr "" -#: misc/tune2fs.c:3096 +#: misc/tune2fs.c:3049 #, c-format msgid "interval between checks is too big (%lu)" msgstr "" -#: misc/tune2fs.c:3103 +#: misc/tune2fs.c:3056 #, c-format msgid "Setting interval between checks to %lu seconds\n" msgstr "" -#: misc/tune2fs.c:3110 +#: misc/tune2fs.c:3063 #, c-format msgid "Setting reserved blocks percentage to %g%% (%llu blocks)\n" msgstr "" -#: misc/tune2fs.c:3116 +#: misc/tune2fs.c:3069 #, c-format msgid "reserved blocks count is too big (%llu)" msgstr "" -#: misc/tune2fs.c:3123 +#: misc/tune2fs.c:3076 #, c-format msgid "Setting reserved blocks count to %llu\n" msgstr "" -#: misc/tune2fs.c:3128 +#: misc/tune2fs.c:3081 msgid "" "\n" "The filesystem already has sparse superblocks.\n" msgstr "" -#: misc/tune2fs.c:3131 +#: misc/tune2fs.c:3084 msgid "" "\n" "Setting the sparse superblock flag not supported\n" "for filesystems with the meta_bg feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3141 +#: misc/tune2fs.c:3094 #, c-format msgid "" "\n" "Sparse superblock flag set. %s" msgstr "" -#: misc/tune2fs.c:3146 +#: misc/tune2fs.c:3099 msgid "" "\n" "Clearing the sparse superblock flag not supported.\n" msgstr "" -#: misc/tune2fs.c:3154 +#: misc/tune2fs.c:3107 #, c-format msgid "Setting time filesystem last checked to %s\n" msgstr "" -#: misc/tune2fs.c:3160 +#: misc/tune2fs.c:3113 #, c-format msgid "Setting reserved blocks uid to %lu\n" msgstr "" -#: misc/tune2fs.c:3192 +#: misc/tune2fs.c:3145 msgid "Error in using clear_mmp. It must be used with -f\n" msgstr "" -#: misc/tune2fs.c:3210 +#: misc/tune2fs.c:3163 msgid "" "The quota feature may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3228 +#: misc/tune2fs.c:3181 msgid "Setting the UUID on this filesystem could take some time." msgstr "" -#: misc/tune2fs.c:3243 +#: misc/tune2fs.c:3196 msgid "The UUID may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3246 +#: misc/tune2fs.c:3199 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:3276 +#: misc/tune2fs.c:3229 msgid "Invalid UUID format\n" msgstr "" -#: misc/tune2fs.c:3292 +#: misc/tune2fs.c:3245 msgid "Need to update journal superblock.\n" msgstr "" -#: misc/tune2fs.c:3314 +#: misc/tune2fs.c:3267 msgid "The inode size may only be changed when the filesystem is unmounted.\n" msgstr "" -#: misc/tune2fs.c:3321 +#: misc/tune2fs.c:3274 msgid "" "Changing the inode size not supported for filesystems with the flex_bg\n" "feature enabled.\n" msgstr "" -#: misc/tune2fs.c:3339 +#: misc/tune2fs.c:3292 #, c-format msgid "Setting inode size %lu\n" msgstr "" -#: misc/tune2fs.c:3343 +#: misc/tune2fs.c:3296 msgid "Failed to change inode size\n" msgstr "" -#: misc/tune2fs.c:3357 +#: misc/tune2fs.c:3310 #, c-format msgid "Setting stride size to %d\n" msgstr "" -#: misc/tune2fs.c:3362 +#: misc/tune2fs.c:3315 #, c-format msgid "Setting stripe width to %d\n" msgstr "" -#: misc/tune2fs.c:3369 +#: misc/tune2fs.c:3322 #, c-format msgid "Setting extended default mount options to '%s'\n" msgstr "" @@ -6985,24 +7045,24 @@ msgstr "" msgid "meta-data blocks" msgstr "" -#: resize/resize2fs.c:1386 resize/resize2fs.c:2473 +#: resize/resize2fs.c:1386 resize/resize2fs.c:2421 msgid "new meta blocks" msgstr "" -#: resize/resize2fs.c:2696 +#: resize/resize2fs.c:2644 msgid "Should never happen! No sb in last super_sparse bg?\n" msgstr "" -#: resize/resize2fs.c:2701 +#: resize/resize2fs.c:2649 msgid "Should never happen! Unexpected old_desc in super_sparse bg?\n" msgstr "" -#: resize/resize2fs.c:2774 +#: resize/resize2fs.c:2722 msgid "Should never happen: resize inode corrupt!\n" msgstr "" #: lib/ext2fs/ext2_err.c:11 -msgid "EXT2FS Library version 1.44.6" +msgid "EXT2FS Library version 1.45.0" msgstr "" #: lib/ext2fs/ext2_err.c:12 diff --git a/version.h b/version.h index aa6d7a8..6c04f72 100644 --- a/version.h +++ b/version.h @@ -7,5 +7,5 @@ * file may be redistributed under the GNU Public License v2. */ -#define E2FSPROGS_VERSION "1.44.6" -#define E2FSPROGS_DATE "5-Mar-2019" +#define E2FSPROGS_VERSION "1.45.0" +#define E2FSPROGS_DATE "6-Mar-2019" -- 1.8.3.1