Merge branch 'maint' into next

Conflicts:
	RELEASE-NOTES
	debian/changelog
	version.h
crypto
Theodore Ts'o 2014-08-25 18:37:37 -04:00
commit c1c8800b71
24 changed files with 1735 additions and 1754 deletions

2
README
View File

@ -1,4 +1,4 @@
This is the new version (1.42.11) of the second extended file
This is the new version (1.42.12) of the second extended file
system management programs.
From time to time, I release new versions of e2fsprogs, to fix

View File

@ -17,6 +17,103 @@ needed by boot loadsers such as yaboot.
Support for the MMP feature can now be disabled at compile time.
E2fsprogs 1.42.12 (August 25, 2014)
===================================
Fix various e2fsck bugs when trying to repair bigalloc file systems.
E2fsck can now repair a file system with an overly large
s_first_meta_bg field, which had previously caused all e2fsprogs
programs to crash when trying to open such a file system.
Fix e2fsck so that it can correctly fix a number of rare file system
corruptions that were discovered when using a file system fuzzer.
Fix e2fsck so it does not try to write back block group descriptors if
they have not been modified.
Mke2fs program will now place metadata blocks in the last flex_bg so
they are contiguous. This reduces free space fragmentation in a
freshly created file system, as well as allowing mke2fs commands which
request extremely large flex_bg size to succeed.
Mke2fs now creates hugefiles more efficiently (with fewer extent tree
blocks).
Fix a 32/64-bit overflow bug that could cause resize2fs to loop
forever. (Addresses-Launchpad-Bug: #1321958)
The resize2fs program will now use much less memory when resizing very
large file systems.
Fix a bug which could cause resize2fs to get confused and produce a
corrupted file system when shrinking a file system that had been
previously expanded and converted to use the meta_bg file system
format, but which no longer needs to use the meta_bg file system
format any longer. This typically happened with large (> 16TB) file
systems. (Addresses Debian Bug: #756922)
The e4defrag program will now defrag backwards-allocated files.
Fix tune2fs updating UUID's when manipulating file systems with
external journals (both the file system and journal UUID).
Fix tune2fs so it can remove an external journal for file systems with
a 1k block size.
Add a new debugfs command, "inode_dump", which prints the inode in hex
and ASCII format.
The debugfs's "set_inode_field" will now automatically allocate blocks
for indirect blocks and extent tree blocks.
Fix debugfs's "set_inode_field" so can properly handle
"block[IND|DIND|TIND]".
The debugfs "rdump" command will now take multiple source arguments.
Fixed a double close(2) bug in "rdump" and "rdump -p".
Fix debugfs's argument parsing for the freefrag command.
Fix filefrag to properly handle using the FIBMAP ioctl (with -B).
(Addresses Launchpad Bug: #1356496)
Clarified messages that were confusing users in debugfs, e2fsck,
mke2fs, and resize2fs (Addresses Debian Bugs: #758029, #757543,
#757544)
Dumpe2fs will now complain if extra arguments are given to it.
(Addresses Debian Bug: #758074)
Updated/fixed various man pages. (Addresses-Debian-Bug: #726760)
Update Czech, French, Spanish, and Sweedish translations.
Programmer's Notes
------------------
The Unix I/O layer will now use pread[64]/pwrite[64] to reduce the
number of system calls issued.
Fixed profiled build.
The libext2fs library will now more efficiently split an extent tree
index block when appending to an end of a file.
Fixed free block accounting for 64-bit file systems.
Add a new function ext2s_inode_size_set() which takes care of all of
the required feature flag modifications.
The regression tests no longer require the presence of the md5sum
program.
Fix build failure on MIPS platforms on Debian (Addresses Debian Bug:
#754605)
Fix various Coverity warnings (#1225003, #1229243, #1252003)
E2fsprogs 1.42.11 (July 9, 2014)
================================

50
debian/changelog vendored
View File

@ -4,6 +4,54 @@ e2fsprogs (1.43~WIP-2014-02-04-1) unstable; urgency=low
-- Theodore Y. Ts'o <tytso@mit.edu> Wed, 04 Feb 2014 23:31:56 -0500
e2fsprogs (1.42.12-1) unstable; urgency=low
* New upstream version
* Fix various e2fsck bugs when trying to repair bigalloc file systems.
* E2fsck can now repair a file system with an overly large
s_first_meta_bg field, which had previously caused all e2fsprogs
programs to crash when trying to open such a file system.
* Fix e2fsck so that it can correctly fix a number of rare file system
corruptions that were discovered when using a file system fuzzer.
* Fix e2fsck so it does not try to write back block group descriptors
if they have not been modified.
* The mke2fs program will now place metadata blocks in the last
flex_bg so they are contiguous. This reduces free space
fragmentation in a freshly created file system, as well as allowing
mke2fs commands which request extremely large flex_bg size to succeed.
* Mke2fs now creates hugefiles more efficiently (with fewer extent
tree blocks).
* Fix a 32/64-bit overflow bug that could cause resize2fs to loop
forever.
* Reduce the memory consumption of resize2fs for very large file
systems.
* Fix a bug that could cause resize2fs to create a corrupted file
system when shrinking a very large file system (typically > 16TB)
that had been previously grown using resize2fs. (Closes: #756922)
* Fix tune2fs updating UUID's when manipulating file systems with
external journals (both the file system and journal UUID).
* Fix tune2fs so it can remove an external journal for file systems
with a 1k block size.
* Add a new debugfs command, "inode_dump", which prints the inode in
hex and ASCII format.
* The debugfs command "set_inode_field" will now automatically
allocate blocks for indirect blocks and extent tree blocks.
* Fix debugfs's "set_inode_field" so can properly handle
"block[IND|DIND|TIND]".
* The debugfs "rdump" command will now take multiple source arguments.
* Fix debugfs's argument parsing for the freefrag command.
* Fixed a double close(2) bug in "rdump" and "rdump -p".
* Fix filefrag to properly handle using the FIBMAP ioctl (with -B).
* e4defrag will now defrag backwards-allocated files
* Clarified messages that were confusing users in debugfs, e2fsck,
mke2fs, and resize2fs (Closes: #758029, #757543, #757544)
* Dumpe2fs will now complain if extra arguments are given to it.
(Closes: #758074)
* Update/clarify various man pages (Closes: #726760)
* Update Czech, French, Spanish, and Sweedish translations
-- Theodore Y. Ts'o <tytso@mit.edu> Mon, 25 Aug 2014 08:23:24 -0400
e2fsprogs (1.42.11-2) unstable; urgency=low
* Don't try to build lib/ext2fs/tst_ext2fs unless running "make
@ -12,7 +60,7 @@ e2fsprogs (1.42.11-2) unstable; urgency=low
but not libss or other libraries (Closes: #754605)
* Update French translation
-- Theodore Y. Ts'o <tytso@mit.edu> Sun, 13 Jul 2014 16:18:27 -0500
-- Theodore Y. Ts'o <tytso@mit.edu> Sun, 13 Jul 2014 16:18:27 -0400
e2fsprogs (1.42.11-1) unstable; urgency=medium

View File

@ -338,8 +338,10 @@ libext2fs.so.2 e2fslibs #MINVER#
ext2fs_inode_io_intern@Base 1.37
ext2fs_inode_scan_flags@Base 1.37
ext2fs_inode_scan_goto_blockgroup@Base 1.37
ext2fs_inode_size_set@Base 1.42.12
ext2fs_inode_table_loc@Base 1.42
ext2fs_inode_table_loc_set@Base 1.42
ext2fs_journal_sb_start@Base 1.42.12
ext2fs_link@Base 1.37
ext2fs_llseek@Base 1.37
ext2fs_lookup@Base 1.37

View File

@ -323,8 +323,11 @@ static struct field_set_info *find_field(struct field_set_info *fields,
*/
if (idx) {
array_idx = strtol(idx, &tmp, 0);
if (*tmp)
if (*tmp) {
*(--idx) = '[';
*delim = ']';
idx = 0;
}
}
/*

View File

@ -1,7 +1,7 @@
\input texinfo @c -*-texinfo-*-
@c %**start of header
@setfilename libext2fs.info
@settitle The EXT2FS Library (version 1.42.11)
@settitle The EXT2FS Library (version 1.42.12)
@synindex tp fn
@comment %**end of header
@ -60,8 +60,8 @@ by the author.
@title The EXT2FS Library
@subtitle The EXT2FS Library
@subtitle Version 1.42.11
@subtitle July 2014
@subtitle Version 1.42.12
@subtitle August 2014
@author by Theodore Ts'o
@ -101,7 +101,7 @@ by the Foundation.
@top The EXT2FS Library
This manual documents the EXT2FS Library, version 1.42.11.
This manual documents the EXT2FS Library, version 1.42.12.
@menu
* Introduction to the EXT2FS Library::

View File

@ -1,17 +1,17 @@
Begin3
Title: EXT2 Filesystem utilities
Version: 1.42.11
Entered-date: 09July2014
Version: 1.42.12
Entered-date: 2014-08-25
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: download.sourceforge.net /pub/sourceforge/e2fsprogs
6184kB e2fsprogs-1.42.11.tar.gz
592kB e2fsprogs-libs-1.42.11.tar.gz
1kB e2fsprogs-1.42.11.lsm
Alternate-site:
Primary-site: ftp.kernel.org /pub/linux/kernel/people/tytso/e2fsprogs
6232kB e2fsprogs-1.42.12.tar.gz
592kB e2fsprogs-libs-1.42.12.tar.gz
1kB e2fsprogs-1.42.12.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
Copying-policy: GPL-2/LGPL-2
End

View File

@ -612,8 +612,10 @@ int main (int argc, char ** argv)
usage();
}
}
if (optind > argc - 1)
if (argc - 1 > optind) {
usage();
exit(1);
}
device_name = argv[optind++];
flags = EXT2_FLAG_JOURNAL_DEV_OK | EXT2_FLAG_SOFTSUPP_FEATURES | EXT2_FLAG_64BITS;
if (force)

View File

@ -119,7 +119,7 @@ mke2fs \- create an ext2/ext3/ext4 filesystem
]
.I device
[
.I blocks-count
.I fs-size
]
@JDEV@.sp
@JDEV@.B "mke2fs \-O journal_dev"
@ -147,23 +147,52 @@ mke2fs \- create an ext2/ext3/ext4 filesystem
@JDEV@]
@JDEV@.I external-journal
@JDEV@[
@JDEV@.I blocks-count
@JDEV@.I fs-size
@JDEV@]
.SH DESCRIPTION
.B mke2fs
is used to create an ext2, ext3, or ext4 filesystem, usually in a disk
partition.
.I device
is the special file corresponding to the device (e.g
.IR /dev/hdXX ).
.I blocks-count
is the number of blocks on the device. If omitted,
partition (or file) named by
.IR device .
.PP
The file system size is specified by
.IR fs-size .
If
.I fs-size
does not have a suffix, it is interpreted as power-of-two kilobytes,
unless the
.B \-b
.I blocksize
option is specified, in which case
.I fs-size
is interpreted as the number of
.I blocksize
blocks. If the fs-size is suffixed by 'k', 'm', 'g', 't'
(either upper-case or lower-case), then it is interpreted in
power-of-two kilobytes, megabytes, gigabytes, terabytes, etc.
If
.I fs-size
is omitted,
.B mke2fs
automagically figures the file system size. If called as
will create the file system based on the device size.
.PP
If
.B mke2fs
is run as
.B mkfs.XXX
(i.e.,
.BR mkfs.ext2 ,
.BR mkfs.ext3 ,
or
.BR mkfs.ext4 )
the option
.B \-t
.I XXX
is implied; so
.B mkfs.ext3
a journal is created as if the
.B \-j
option was specified.
will create a file system for use with ext3,
.B mkfs.ext4
will create a file system for use with ext4, and so on.
.PP
The defaults of the parameters for the newly created filesystem, if not
overridden by the options listed below, are controlled by the

View File

@ -1850,6 +1850,8 @@ profile_error:
flags |= CHECK_FS_EXIST;
if (!quiet)
flags |= VERBOSE_CREATE;
if (fs_blocks_count == 0)
flags |= NO_SIZE;
if (!check_plausibility(device_name, flags, &is_device) && !force)
proceed_question(proceed_delay);

View File

@ -198,6 +198,11 @@ int check_plausibility(const char *device, int flags, int *ret_is_dev)
char *fs_label = NULL;
fd = ext2fs_open_file(device, fl, 0666);
if ((fd < 0) && (errno == ENOENT) && (flags & NO_SIZE)) {
fprintf(stderr, _("The file %s does not exist and no "
"size was specified.\n"), device);
exit(1);
}
if ((fd < 0) && (errno == ENOENT) && (flags & CREATE_FILE)) {
fl |= O_CREAT;
fd = ext2fs_open_file(device, fl, 0666);

View File

@ -22,6 +22,7 @@ extern char *journal_location_string;
#define CREATE_FILE 0x0002
#define CHECK_FS_EXIST 0x0004
#define VERBOSE_CREATE 0x0008
#define NO_SIZE 0x0010
#ifndef HAVE_STRCASECMP
extern int strcasecmp (char *s1, char *s2);

View File

@ -71,7 +71,7 @@ msgstr ""
"Project-Id-Version: e2fsprogs 1.42.11-rc0\n"
"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
"POT-Creation-Date: 2014-07-05 23:41-0400\n"
"PO-Revision-Date: 2014-07-06 21:09+0200\n"
"PO-Revision-Date: 2014-07-16 21:58+0200\n"
"Last-Translator: Petr Pisar <petr.pisar@atlas.cz>\n"
"Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
"Language: cs\n"
@ -1918,7 +1918,7 @@ msgstr "Nemohu klonovat soubor: %m\n"
#. @-expanded: Pass 2: Checking directory structure\n
#: e2fsck/problem.c:1066
msgid "Pass 2: Checking @d structure\n"
msgstr "Průchod 2: Kontroluje se strukturu adresářů\n"
msgstr "Průchod 2: Kontroluje se struktura adresářů\n"
#. @-expanded: invalid inode number for '.' in directory inode %i.\n
#: e2fsck/problem.c:1071
@ -6286,8 +6286,8 @@ msgid "Should never happen: resize inode corrupt!\n"
msgstr "Toto by se nikdy nemělo stát: iuzly pro změnu velikosti jsou poškozeny!\n"
#: lib/ext2fs/ext2_err.c:11
msgid "EXT2FS Library version 1.42.11"
msgstr "Knihovna EXT2FS verze 1.42.11"
msgid "EXT2FS Library version 1.42.10"
msgstr "Knihovna EXT2FS verze 1.42.10"
#: lib/ext2fs/ext2_err.c:12
msgid "Wrong magic number for ext2_filsys structure"

File diff suppressed because it is too large Load Diff

1749
po/es.po

File diff suppressed because it is too large Load Diff

View File

@ -72,7 +72,7 @@ msgstr ""
"Project-Id-Version: GNU e2fsprogs 1.42.11-rc0\n"
"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
"POT-Creation-Date: 2014-07-05 23:41-0400\n"
"PO-Revision-Date: 2014-07-13 15:59+0200\n"
"PO-Revision-Date: 2014-08-13 00:49+0200\n"
"Last-Translator: Samuel Thibault <samuel.thibault@ens-lyon.org>\n"
"Language-Team: French <traduc@traduc.org>\n"
"Language: fr\n"
@ -2641,7 +2641,7 @@ msgstr ""
#: e2fsck/unix.c:131
#, c-format
msgid "%s: %u/%u files (%0d.%d%% non-contiguous), %llu/%llu blocks\n"
msgstr "%s : %u/%u fichiers (%0d.%d%% non contigüs), %llu/%llu blocs\n"
msgstr "%s : %u/%u fichiers (%0d.%d%% non contigus), %llu/%llu blocs\n"
#: e2fsck/unix.c:157
#, c-format

359
po/sv.po
View File

@ -3,7 +3,7 @@
# This file is distributed under the same license as the e2fsprogs package.
# Göran Uddeborg <goeran@uddeborg.se>, 2003, 2005, 2006, 2008, 2009, 2010, 2011, 2012, 2014.
#
# $Revision: 1.79 $
# $Revision: 1.81 $
#
#. The strings in e2fsck's problem.c can be very hard to translate,
#. since the strings are expanded in two different ways. First of all,
@ -69,10 +69,10 @@
#.
msgid ""
msgstr ""
"Project-Id-Version: e2fsprogs 1.42.10\n"
"Project-Id-Version: e2fsprogs 1.42.11-rc0\n"
"Report-Msgid-Bugs-To: tytso@alum.mit.edu\n"
"POT-Creation-Date: 2014-07-09 23:26-0400\n"
"PO-Revision-Date: 2014-06-23 22:17+0200\n"
"POT-Creation-Date: 2014-07-05 23:41-0400\n"
"PO-Revision-Date: 2014-07-16 10:19+0200\n"
"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@ -814,10 +814,8 @@ msgid ""
msgstr ""
"\n"
"Superblocket kunde inte läsas eller beskriver inte ett giltigt\n"
"ext2/ext3/ext4-filsystem. Om enheten är giltig och den verkligen innehåller "
"ett\n"
"ext2/ext3/ext4-filsystem (och inte växlingsutrymme eller ufs eller något "
"annat)\n"
"ext2/ext3/ext4-filsystem. Om enheten är giltig och den verkligen innehåller ett\n"
"ext2/ext3/ext4-filsystem (och inte växlingsutrymme eller ufs eller något annat)\n"
"är superblocket trasigt, och du kan försöka köra med ett alternativt\n"
"superblock:\n"
" e2fsck -b 8193 <enhet>\n"
@ -938,8 +936,7 @@ msgstr "Extern journal stödjer inte detta filsystem\n"
#: e2fsck/problem.c:215
msgid ""
"@f @j @S is unknown type %N (unsupported).\n"
"It is likely that your copy of e2fsck is old and/or doesn't support this @j "
"format.\n"
"It is likely that your copy of e2fsck is old and/or doesn't support this @j format.\n"
"It is also possible the @j @S is corrupt.\n"
msgstr ""
"Filsystemsjournalsuperblock är av okänd typ %N (ej stött).\n"
@ -954,10 +951,8 @@ msgstr "Journalsuperblock är trasigt.\n"
#. @-expanded: superblock has_journal flag is clear, but a journal is present.\n
#: e2fsck/problem.c:228
#, fuzzy
msgid "@S has_@j flag is clear, but a @j is present.\n"
msgstr ""
"Superblocksflagga har_journal är nollställd, men en journal %s finns.\n"
msgstr "Superblocksflaggan has_journal är nollställd, men en journal finns.\n"
#. @-expanded: superblock needs_recovery flag is set, but no journal is present.\n
#: e2fsck/problem.c:233
@ -967,8 +962,7 @@ msgstr "Superblockflagga behöver_rättas är satt, men ingen journal finns.\n"
#. @-expanded: superblock needs_recovery flag is clear, but journal has data.\n
#: e2fsck/problem.c:238
msgid "@S needs_recovery flag is clear, but @j has data.\n"
msgstr ""
"Superblocksflagga behöver_rättas är nollställd, men journal har data.\n"
msgstr "Superblocksflagga behöver_rättas är nollställd, men journal har data.\n"
#. @-expanded: Clear journal
#: e2fsck/problem.c:243
@ -978,14 +972,12 @@ msgstr "Töm journal"
#. @-expanded: filesystem has feature flag(s) set, but is a revision 0 filesystem.
#: e2fsck/problem.c:248 e2fsck/problem.c:702
msgid "@f has feature flag(s) set, but is a revision 0 @f. "
msgstr ""
"filsystemet har funktionsflaggor satta, men är ett revision 0-filsystem. "
msgstr "filsystemet har funktionsflaggor satta, men är ett revision 0-filsystem. "
#. @-expanded: %s orphaned inode %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n
#: e2fsck/problem.c:253
msgid "%s @o @i %i (uid=%Iu, gid=%Ig, mode=%Im, size=%Is)\n"
msgstr ""
"%s föräldralös inod %i (uid=%Iu, gid=%Ig, rättighet=%Im, storlek=%Is)\n"
msgstr "%s föräldralös inod %i (uid=%Iu, gid=%Ig, rättighet=%Im, storlek=%Is)\n"
#. @-expanded: illegal %B (%b) found in orphaned inode %i.\n
#: e2fsck/problem.c:258
@ -1092,8 +1084,7 @@ msgstr ""
#. @-expanded: Resize_inode not enabled, but the resize inode is non-zero.
#: e2fsck/problem.c:330
msgid "Resize_@i not enabled, but the resize @i is non-zero. "
msgstr ""
"Resize_inode är inte aktiverat, men storleksändringsinoden är inte noll. "
msgstr "Resize_inode är inte aktiverat, men storleksändringsinoden är inte noll. "
#. @-expanded: Resize inode not valid.
#: e2fsck/problem.c:335
@ -1145,8 +1136,7 @@ msgstr "kontrollsumma för gruppbeskrivare %g är %04x, skall vara %04y. "
#: e2fsck/problem.c:364
#, c-format
msgid "@g descriptor %g marked uninitialized without feature set.\n"
msgstr ""
"gruppbeskrivare %g är markerad oinitierad utan att egenskapen är satt.\n"
msgstr "gruppbeskrivare %g är markerad oinitierad utan att egenskapen är satt.\n"
#. @-expanded: group descriptor %g has invalid unused inodes count %b.
#: e2fsck/problem.c:369
@ -1173,8 +1163,7 @@ msgstr "Flaggan test_fs är satt (och ext4 är tillgänligt). "
#: e2fsck/problem.c:388
msgid ""
"@S last mount time is in the future.\n"
"\t(by less than a day, probably due to the hardware clock being incorrectly "
"set) "
"\t(by less than a day, probably due to the hardware clock being incorrectly set) "
msgstr ""
"Superblockets senaste monteringstid ligger i framtiden.\n"
"\t(med mindre än en dag, förmodligen för att hårdvaruklockan går fel)"
@ -1185,8 +1174,7 @@ msgstr ""
#: e2fsck/problem.c:394
msgid ""
"@S last write time is in the future.\n"
"\t(by less than a day, probably due to the hardware clock being incorrectly "
"set). "
"\t(by less than a day, probably due to the hardware clock being incorrectly set). "
msgstr ""
"Superblockets skrevs senast i framtiden.\n"
"\t(med mindre än en dag, förmodligen för att hårdvaruklockan går fel)"
@ -1236,9 +1224,7 @@ msgstr "ext2fs_check_desc: %m\n"
#. @-expanded: superblock 64bit filesystems needs extents to access the whole disk.
#: e2fsck/problem.c:440
msgid "@S 64bit filesystems needs extents to access the whole disk. "
msgstr ""
"superblock på 64-bitars filsystem behöver utsträckningar för att komma åt "
"hela disken. "
msgstr "superblock på 64-bitars filsystem behöver utsträckningar för att komma åt hela disken. "
#. @-expanded: Pass 1: Checking inodes, blocks, and sizes\n
#: e2fsck/problem.c:447
@ -1281,20 +1267,17 @@ msgstr "Inod %i är en nollängds katalog. "
#. @-expanded: group %g's block bitmap at %b conflicts with some other fs block.\n
#: e2fsck/problem.c:481
msgid "@g %g's @b @B at %b @C.\n"
msgstr ""
"Grupp %g:s blockbitkarta vid %b står i konflikt med annat filsystemblock.\n"
msgstr "Grupp %g:s blockbitkarta vid %b står i konflikt med annat filsystemblock.\n"
#. @-expanded: group %g's inode bitmap at %b conflicts with some other fs block.\n
#: e2fsck/problem.c:486
msgid "@g %g's @i @B at %b @C.\n"
msgstr ""
"Grupp %g:s inodbitkarta vid %b står i konflikt med annat filsystemblock.\n"
msgstr "Grupp %g:s inodbitkarta vid %b står i konflikt med annat filsystemblock.\n"
#. @-expanded: group %g's inode table at %b conflicts with some other fs block.\n
#: e2fsck/problem.c:491
msgid "@g %g's @i table at %b @C.\n"
msgstr ""
"Grupp %g:s inodtabell vid %b står i konflikt med annat filsystemblock.\n"
msgstr "Grupp %g:s inodtabell vid %b står i konflikt med annat filsystemblock.\n"
#. @-expanded: group %g's block bitmap (%b) is bad.
#: e2fsck/problem.c:496
@ -1356,8 +1339,7 @@ msgstr "Duplicerat eller felaktigt block används!\n"
#. @-expanded: Bad block %b used as bad block inode indirect block.
#: e2fsck/problem.c:551
msgid "Bad @b %b used as bad @b @i indirect @b. "
msgstr ""
"Felaktigt block %b använt som indirektblock för inod för dåliga block. "
msgstr "Felaktigt block %b använt som indirektblock för inod för dåliga block. "
#. @-expanded: \n
#. @-expanded: The bad block inode has probably been corrupted. You probably\n
@ -1406,8 +1388,7 @@ msgstr "Det primära superblocket (%b) är på listan över dåliga block.\n"
#. @-expanded: Block %b in the primary group descriptors is on the bad block list\n
#: e2fsck/problem.c:579
msgid "Block %b in the primary @g descriptors is on the bad @b list\n"
msgstr ""
"Block %b i de primära gruppbeskrivarna är på listan över dåliga block\n"
msgstr "Block %b i de primära gruppbeskrivarna är på listan över dåliga block\n"
#. @-expanded: Warning: Group %g's superblock (%b) is bad.\n
#: e2fsck/problem.c:585
@ -1417,21 +1398,17 @@ msgstr "Varning: Grupp %g:s superblock (%b) är dåligt.\n"
#. @-expanded: Warning: Group %g's copy of the group descriptors has a bad block (%b).\n
#: e2fsck/problem.c:590
msgid "Warning: Group %g's copy of the @g descriptors has a bad @b (%b).\n"
msgstr ""
"Varning: Grupp %g:s kopia av gruppbeskrivarna har ett dåligt block (%b).\n"
msgstr "Varning: Grupp %g:s kopia av gruppbeskrivarna har ett dåligt block (%b).\n"
#. @-expanded: Programming error? block #%b claimed for no reason in process_bad_block.\n
#: e2fsck/problem.c:596
msgid "Programming error? @b #%b claimed for no reason in process_bad_@b.\n"
msgstr ""
"Programmeringsfel? Block nr. %b tas i anspråk utan anledning i "
"process_bad_block.\n"
msgstr "Programmeringsfel? Block nr. %b tas i anspråk utan anledning i process_bad_block.\n"
#. @-expanded: error allocating %N contiguous block(s) in block group %g for %s: %m\n
#: e2fsck/problem.c:602
msgid "@A %N contiguous @b(s) in @b @g %g for %s: %m\n"
msgstr ""
"Fel vid allokering av %N konsekutiva block i blockgrupp %g för %s: %m\n"
msgstr "Fel vid allokering av %N konsekutiva block i blockgrupp %g för %s: %m\n"
#. @-expanded: error allocating block buffer for relocating %s\n
#: e2fsck/problem.c:607
@ -1502,9 +1479,7 @@ msgstr "Fel vid lagring av inodsräknarinformation (inod=%i, antal=%N): %m\n"
#. @-expanded: Error storing directory block information (inode=%i, block=%b, num=%N): %m\n
#: e2fsck/problem.c:667
msgid "Error storing @d @b information (@i=%i, @b=%b, num=%N): %m\n"
msgstr ""
"Fel vid lagring av katalogblocksinformation (inod=%i, block=%b, antal=%N): "
"%m\n"
msgstr "Fel vid lagring av katalogblocksinformation (inod=%i, block=%b, antal=%N): %m\n"
#. @-expanded: Error reading inode %i: %m\n
#: e2fsck/problem.c:673
@ -1533,8 +1508,7 @@ msgstr ""
#: e2fsck/problem.c:692
#, c-format
msgid "@i %i has @cion flag set on @f without @cion support. "
msgstr ""
"Inod %i har kompressionsflagga satt på filsystem utan kompressionsstöd. "
msgstr "Inod %i har kompressionsflagga satt på filsystem utan kompressionsstöd. "
#. @-expanded: Special (device/socket/fifo) inode %i has non-zero size.
#: e2fsck/problem.c:697
@ -1705,9 +1679,7 @@ msgstr "Utökat attribut i inod %i har en värdeposition (%N) som är ogiltig\n"
#. @-expanded: extended attribute in inode %i has a value block (%N) which is invalid (must be 0)\n
#: e2fsck/problem.c:858
msgid "@a in @i %i has a value @b (%N) which is @n (must be 0)\n"
msgstr ""
"Utökat attribut i inod %i har ett värdeblock (%N) som är ogiltigt (måste "
"vara 0)\n"
msgstr "Utökat attribut i inod %i har ett värdeblock (%N) som är ogiltigt (måste vara 0)\n"
#. @-expanded: extended attribute in inode %i has a value size (%N) which is invalid\n
#: e2fsck/problem.c:863
@ -1764,17 +1736,13 @@ msgstr ""
#: e2fsck/problem.c:899
#, c-format
msgid "@i %i has EXTENTS_FL flag set on @f without extents support.\n"
msgstr ""
"Inod %i har flaggan EXTENTS_FL satt på filsystemet utan stöd för "
"utsträckningar.\n"
msgstr "Inod %i har flaggan EXTENTS_FL satt på filsystemet utan stöd för utsträckningar.\n"
#. @-expanded: inode %i is in extent format, but superblock is missing EXTENTS feature\n
#: e2fsck/problem.c:904
#, c-format
msgid "@i %i is in extent format, but @S is missing EXTENTS feature\n"
msgstr ""
"inod %i är i utsträckningsformat, men superblocket saknar egenskapen "
"EXTENTS\n"
msgstr "inod %i är i utsträckningsformat, men superblocket saknar egenskapen EXTENTS\n"
#. @-expanded: inode %i missing EXTENT_FL, but is in extents format\n
#: e2fsck/problem.c:909
@ -1868,8 +1836,7 @@ msgid ""
"Pass 1B: Rescanning for @m @bs\n"
msgstr ""
"\n"
"Kör ytterliggare pass för att lösa upp block som används av mer än en "
"inod ...\n"
"Kör ytterliggare pass för att lösa upp block som används av mer än en inod ...\n"
"Pass 1B: Söker igen efter block som används flera gånger\n"
#. @-expanded: multiply-claimed block(s) in inode %i:
@ -1898,15 +1865,12 @@ msgstr "Fel vid iterering över block i inod %i (%s): %m\n"
#. @-expanded: Error adjusting refcount for extended attribute block %b (inode %i): %m\n
#: e2fsck/problem.c:1010 e2fsck/problem.c:1325
msgid "Error adjusting refcount for @a @b %b (@i %i): %m\n"
msgstr ""
"Fel vid justering av referensräknare för externa attribut-block %b (inod "
"%i): %m\n"
msgstr "Fel vid justering av referensräknare för externa attribut-block %b (inod %i): %m\n"
#. @-expanded: Pass 1C: Scanning directories for inodes with multiply-claimed blocks\n
#: e2fsck/problem.c:1015
msgid "Pass 1C: Scanning directories for @is with @m @bs\n"
msgstr ""
"Pass 1C: Söker kataloger efter inoder med flerfaldigt ianspråkstagna block\n"
msgstr "Pass 1C: Söker kataloger efter inoder med flerfaldigt ianspråkstagna block\n"
#. @-expanded: Pass 1D: Reconciling multiply-claimed blocks\n
#: e2fsck/problem.c:1021
@ -1987,8 +1951,7 @@ msgstr "Post \"%Dn\" i %p (%i) är en länk till \".\" "
#. @-expanded: entry '%Dn' in %p (%i) points to inode (%Di) located in a bad block.\n
#: e2fsck/problem.c:1091
msgid "@E points to @i (%Di) located in a bad @b.\n"
msgstr ""
"Post \"%Dn\" i %p (%i) pekar på inod (%Di) som finns i ett trasigt block.\n"
msgstr "Post \"%Dn\" i %p (%i) pekar på inod (%Di) som finns i ett trasigt block.\n"
#. @-expanded: entry '%Dn' in %p (%i) is a link to directory %P (%Di).\n
#: e2fsck/problem.c:1096
@ -2020,8 +1983,7 @@ msgstr "\"..\" saknas i kataloginod %i.\n"
#. @-expanded: First entry '%Dn' (inode=%Di) in directory inode %i (%p) should be '.'\n
#: e2fsck/problem.c:1121
msgid "First @e '%Dn' (@i=%Di) in @d @i %i (%p) @s '.'\n"
msgstr ""
"Första post \"%Dn\" (inod=%Di) i kataloginod %i (%p) skulle varit \".\"\n"
msgstr "Första post \"%Dn\" (inod=%Di) i kataloginod %i (%p) skulle varit \".\"\n"
#. @-expanded: Second entry '%Dn' (inode=%Di) in directory inode %i should be '..'\n
#: e2fsck/problem.c:1126
@ -2175,8 +2137,7 @@ msgstr "Sätter filtyp för post \"%Dn\" i %p (%i) till %N.\n"
#. @-expanded: entry '%Dn' in %p (%i) has an incorrect filetype (was %Dt, should be %N).\n
#: e2fsck/problem.c:1266
msgid "@E has an incorrect filetype (was %Dt, @s %N).\n"
msgstr ""
"Post \"%Dn\" i %p (%i) har felaktig filtyp (var %Dt, skulle varit %N).\n"
msgstr "Post \"%Dn\" i %p (%i) har felaktig filtyp (var %Dt, skulle varit %N).\n"
#. @-expanded: entry '%Dn' in %p (%i) has filetype set.\n
#: e2fsck/problem.c:1271
@ -2201,9 +2162,7 @@ msgstr "Utökat attribut-block för inod %i (%Q) är ogiltigt (%If).\n"
#. @-expanded: filesystem contains large files, but lacks LARGE_FILE flag in superblock.\n
#: e2fsck/problem.c:1291
msgid "@f contains large files, but lacks LARGE_FILE flag in @S.\n"
msgstr ""
"Filsystem innehåller stora filer, men saknar flaggan LARGE_FILE i "
"superblock.\n"
msgstr "Filsystem innehåller stora filer, men saknar flaggan LARGE_FILE i superblock.\n"
#. @-expanded: problem in HTREE directory inode %d: %B not referenced\n
#: e2fsck/problem.c:1296
@ -2305,16 +2264,12 @@ msgstr "Oväntat block i HTREE-katalog %d (%q).\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di in group %g where _INODE_UNINIT is set.\n
#: e2fsck/problem.c:1379
msgid "@E references @i %Di in @g %g where _INODE_UNINIT is set.\n"
msgstr ""
"Post \"%Dn\" i %p (%i) refererar inod %Di i grupp %g där _INODE_UNINIT är "
"satt.\n"
msgstr "Post \"%Dn\" i %p (%i) refererar inod %Di i grupp %g där _INODE_UNINIT är satt.\n"
#. @-expanded: entry '%Dn' in %p (%i) references inode %Di found in group %g's unused inodes area.\n
#: e2fsck/problem.c:1384
msgid "@E references @i %Di found in @g %g's unused inodes area.\n"
msgstr ""
"Post \"%Dn\" i %p (%i) refererar inod %Di funnen i oanvänt inodsområde i "
"grupp %g.\n"
msgstr "Post \"%Dn\" i %p (%i) refererar inod %Di funnen i oanvänt inodsområde i grupp %g.\n"
#. @-expanded: i_file_acl_hi for inode %i (%Q) is %N, should be zero.\n
#: e2fsck/problem.c:1389
@ -2396,8 +2351,7 @@ msgstr "ext2fs_new_dir_block: %m när nytt katalogblock skapades\n"
#: e2fsck/problem.c:1461
#, c-format
msgid "ext2fs_write_dir_@b: %m while writing the @d @b for /@l\n"
msgstr ""
"ext2fs_write_dir_block: %m vid skrivning av katalogblocket för /lost+found\n"
msgstr "ext2fs_write_dir_block: %m vid skrivning av katalogblocket för /lost+found\n"
#. @-expanded: Error while adjusting inode count on inode %i\n
#: e2fsck/problem.c:1466
@ -2424,8 +2378,7 @@ msgid ""
"Couldn't fix parent of @i %i: Couldn't find parent @d @e\n"
"\n"
msgstr ""
"Kunde inte rätta förälder till inod %i: Kunde inte hitta "
"förälderkatalogpost\n"
"Kunde inte rätta förälder till inod %i: Kunde inte hitta förälderkatalogpost\n"
"\n"
#. @-expanded: Error creating root directory (%s): %m\n
@ -2504,8 +2457,7 @@ msgid ""
"@i_link_info[%i] is %N, @i.i_links_count is %Il. They @s the same!\n"
msgstr ""
"VARNING: PROGRAMMERINGSFEL I E2FSCK!\n"
" ELLER NÅGON KLANTSKALLE (DU) KONTROLLERAR ETT MONTERAT (AKTIVT) "
"FILSYSTEM.\n"
" ELLER NÅGON KLANTSKALLE (DU) KONTROLLERAR ETT MONTERAT (AKTIVT) FILSYSTEM.\n"
"inod_link_info[%i] är %N, inod.i_links_count är %Il. De skulle vara samma!\n"
#. @-expanded: Pass 5: Checking group summary information\n
@ -2561,9 +2513,7 @@ msgstr "Antal fria block är fel (%b, räknade=%c).\n"
#. @-expanded: PROGRAMMING ERROR: filesystem (#%N) bitmap endpoints (%b, %c) don't match calculated bitmap
#. @-expanded: endpoints (%i, %j)\n
#: e2fsck/problem.c:1659
msgid ""
"PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B "
"endpoints (%i, %j)\n"
msgid "PROGRAMMING ERROR: @f (#%N) @B endpoints (%b, %c) don't match calculated @B endpoints (%i, %j)\n"
msgstr ""
"PROGRAMMERINGSFEL: filsystem (nr. %N) bitkartas ändpunkter (%b, %c) stämmer\n"
"inte med beräknade bitkarteändpunkter (%i, %j)\n"
@ -2670,8 +2620,7 @@ msgid ""
" -p Automatic repair (no questions)\n"
" -n Make no changes to the filesystem\n"
" -y Assume \"yes\" to all questions\n"
" -c Check for bad blocks and add them to the badblock "
"list\n"
" -c Check for bad blocks and add them to the badblock list\n"
" -f Force checking even if filesystem is marked clean\n"
msgstr ""
"\n"
@ -2680,8 +2629,7 @@ msgstr ""
" -n Gör inga förändringar av filsystemet\n"
" -y Anta \"ja\" som svar på alla frågor\n"
" -c Leta efter dåliga block och lägg till dem i listan\n"
" -f Framtvinga kontroll även om filsystemet är markerat "
"rent\n"
" -f Framtvinga kontroll även om filsystemet är markerat rent\n"
#: e2fsck/unix.c:86
msgid ""
@ -2848,24 +2796,24 @@ msgid "while determining whether %s is mounted."
msgstr "när det avgjordes om %s är monterat."
#: e2fsck/unix.c:253
#, fuzzy, c-format
#, c-format
msgid "Warning! %s is mounted.\n"
msgstr "Varning! %s är %s.\n"
msgstr "Varning! %s är monterat.\n"
#: e2fsck/unix.c:256
#, fuzzy, c-format
#, c-format
msgid "Warning! %s is in use.\n"
msgstr "Varning! %s är %s.\n"
msgstr "Varning! %s används.\n"
#: e2fsck/unix.c:262
#, fuzzy, c-format
#, c-format
msgid "%s is mounted.\n"
msgstr "%s är monterat, "
msgstr "%s är monterat.\n"
#: e2fsck/unix.c:264
#, fuzzy, c-format
#, c-format
msgid "%s is in use.\n"
msgstr "%s är %s.\n"
msgstr "%s används.\n"
#: e2fsck/unix.c:266
msgid ""
@ -3030,12 +2978,8 @@ msgstr ""
#: e2fsck/unix.c:1132
#, c-format
msgid ""
"MMP interval is %u seconds and total wait time is %u seconds. Please "
"wait...\n"
msgstr ""
"MMP-intervall är %u sekunder och den totala väntetiden är %u sekunder. Var "
"god dröj ...\n"
msgid "MMP interval is %u seconds and total wait time is %u seconds. Please wait...\n"
msgstr "MMP-intervall är %u sekunder och den totala väntetiden är %u sekunder. Var god dröj ...\n"
#: e2fsck/unix.c:1149 e2fsck/unix.c:1154
msgid "while checking MMP block"
@ -3138,12 +3082,8 @@ msgid "while checking ext3 journal for %s"
msgstr "vid kontroll av ext3-journal för %s"
#: e2fsck/unix.c:1492
msgid ""
"Warning: skipping journal recovery because doing a read-only filesystem "
"check.\n"
msgstr ""
"Varning: hoppar över journalåterhämtning eftersom en läsningskontroll av "
"filsystem görs.\n"
msgid "Warning: skipping journal recovery because doing a read-only filesystem check.\n"
msgstr "Varning: hoppar över journalåterhämtning eftersom en läsningskontroll av filsystem görs.\n"
#: e2fsck/unix.c:1504
#, c-format
@ -3375,9 +3315,7 @@ msgid "while allocating zeroizing buffer"
msgstr "vid allokering av nollställningsbuffert"
#: e2fsck/util.c:785
msgid ""
"UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is "
"running.\n"
msgid "UNEXPECTED INCONSISTENCY: the filesystem is being modified while fsck is running.\n"
msgstr "OVÄNTAD INKONSISTENS: filsystemet modifieras medan fsck körs.\n"
#: misc/badblocks.c:69
@ -3388,8 +3326,7 @@ msgstr "klar \n"
#, c-format
msgid ""
"Usage: %s [-b block_size] [-i input_file] [-o output_file] [-svwnf]\n"
" [-c blocks_at_once] [-d delay_factor_between_reads] [-e "
"max_bad_blocks]\n"
" [-c blocks_at_once] [-d delay_factor_between_reads] [-e max_bad_blocks]\n"
" [-p num_passes] [-t test_pattern [-t test_pattern [...]]]\n"
" device [last_block [first_block]]\n"
msgstr ""
@ -3582,9 +3519,9 @@ msgid "Pass completed, %u bad blocks found. (%d/%d/%d errors)\n"
msgstr "Pass avslutat, %u dåliga block hittade. (%d/%d/%d fel)\n"
#: misc/chattr.c:86
#, fuzzy, c-format
#, c-format
msgid "Usage: %s [-RVf] [-+=aAcCdDeijsStTu] [-v version] files...\n"
msgstr "Användning: %s [-RVf] [-+=AaCcDdeijsSu] [-v version] filer…\n"
msgstr "Användning: %s [-RVf] [-+=aAcCdDeijsStTu] [-v version] filer…\n"
#: misc/chattr.c:155
#, c-format
@ -3636,8 +3573,7 @@ msgstr "Måste använda \"-v\", =, - eller +\n"
#: misc/dumpe2fs.c:55
#, c-format
msgid "Usage: %s [-bfhixV] [-o superblock=<num>] [-o blocksize=<num>] device\n"
msgstr ""
"Användning: %s [-bfhixV] [-o superblock=<num>] [-o blocksize=<num>] enhet\n"
msgstr "Användning: %s [-bfhixV] [-o superblock=<num>] [-o blocksize=<num>] enhet\n"
#: misc/dumpe2fs.c:159
msgid "blocks"
@ -3845,8 +3781,7 @@ msgstr ""
"\n"
"Felaktiga utökade flaggor angivna: %s\n"
"\n"
"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas "
"med\n"
"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas med\n"
"\tett likhetstecken (\"=\").\n"
"\n"
"Giltiga utökade flaggor är:\n"
@ -3884,12 +3819,8 @@ msgstr " %s -I enhet avbildsfil\n"
#: misc/e2image.c:104
#, c-format
msgid ""
" %s -ra [ -cfnp ] [ -o src_offset ] [ -O dest_offset ] src_fs "
"[ dest_fs ]\n"
msgstr ""
" %s -ra [ -cfnp ] [ -o källavstånd ] [ -O målavstånd ] käll-fs "
"[ mål-fs ]\n"
msgid " %s -ra [ -cfnp ] [ -o src_offset ] [ -O dest_offset ] src_fs [ dest_fs ]\n"
msgstr " %s -ra [ -cfnp ] [ -o källavstånd ] [ -O målavstånd ] käll-fs [ mål-fs ]\n"
#: misc/e2image.c:169 misc/e2image.c:576 misc/e2image.c:582
#: misc/e2image.c:1178
@ -3954,8 +3885,7 @@ msgid "Copying "
msgstr "Kopierar "
#: misc/e2image.c:623
msgid ""
"Stopping now will destroy the filesystem, interrupt again if you are sure\n"
msgid "Stopping now will destroy the filesystem, interrupt again if you are sure\n"
msgstr "Att sluta nu kommer förstöra filsystemet, avbryt igen om du är säker\n"
#: misc/e2image.c:649
@ -3987,12 +3917,8 @@ msgid "while allocating l2 cache"
msgstr "när l2-cache allokerades"
#: misc/e2image.c:823
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 ""
"Varning: det finns fortfarande tabeller i cachen medans cachen skrivs, data "
"kommer gå förlorade så avbilden kommer kanse inte vara korrekt.\n"
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 "Varning: det finns fortfarande tabeller i cachen medans cachen skrivs, data kommer gå förlorade så avbilden kommer kanse inte vara korrekt.\n"
#: misc/e2image.c:1145
msgid "while allocating ext2_qcow2_image"
@ -4004,8 +3930,7 @@ msgstr "när ext2_qcow2_image initierades"
#: misc/e2image.c:1211 misc/e2image.c:1229
msgid "Programming error: multiple sequential refcount blocks created!\n"
msgstr ""
"Programmeringsfel: multipla sekventiella referensräknarblock skapade!\n"
msgstr "Programmeringsfel: multipla sekventiella referensräknarblock skapade!\n"
#: misc/e2image.c:1269
msgid "while allocating block bitmap"
@ -4278,12 +4203,8 @@ msgstr "Kunde inte allokera minne för filsystemtyper\n"
#: misc/fsck.c:884
#, c-format
msgid ""
"%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass "
"number\n"
msgstr ""
"%s: hoppar över felaktig rad i /etc/fstab: bind-montering med fsck-"
"passnummer som inte är noll\n"
msgid "%s: skipping bad line in /etc/fstab: bind mount with nonzero fsck pass number\n"
msgstr "%s: hoppar över felaktig rad i /etc/fstab: bind-montering med fsck-passnummer som inte är noll\n"
#: misc/fsck.c:911
#, c-format
@ -4300,11 +4221,8 @@ msgid "--waiting-- (pass %d)\n"
msgstr "--väntar-- (pass %d)\n"
#: misc/fsck.c:1078
msgid ""
"Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
msgstr ""
"Användning: fsck [-AMNPRTV] [ -C [ fh ] ] [-t fstyp] [fs-flaggor] "
"[filsys ...]\n"
msgid "Usage: fsck [-AMNPRTV] [ -C [ fd ] ] [-t fstype] [fs-options] [filesys ...]\n"
msgstr "Användning: fsck [-AMNPRTV] [ -C [ fh ] ] [-t fstyp] [fs-flaggor] [filsys ...]\n"
#: misc/fsck.c:1120
#, c-format
@ -4340,8 +4258,7 @@ msgid ""
"\t[-m reserved-blocks-percentage] [-o creator-os]\n"
"\t[-g blocks-per-group] [-L volume-label] [-M last-mounted-directory]\n"
"\t[-O feature[,...]] [-r fs-revision] [-E extended-option[,...]]\n"
"\t[-t fs-type] [-T usage-type ] [-U UUID] [-jnqvDFKSV] device [blocks-"
"count]\n"
"\t[-t fs-type] [-T usage-type ] [-U UUID] [-jnqvDFKSV] device [blocks-count]\n"
msgstr ""
"Användning: %s [-c|-l filnamn] [-b blockstorlek] [-C klusterstorlek]\n"
"\t[-i byte-per-inod] [-I inodstorlek] [-J journalflaggor]\n"
@ -4600,7 +4517,7 @@ msgid "Invalid mmp_update_interval: %s\n"
msgstr "Ogiltigt mmp_update_interval: %s\n"
#: misc/mke2fs.c:826
#, fuzzy, c-format
#, c-format
msgid "Invalid # of backup superblocks: %s\n"
msgstr "Ogiltigt antal superblockskopior: %s\n"
@ -4621,8 +4538,7 @@ msgstr "Ogiltig storleksändringsparameter: %s\n"
#: misc/mke2fs.c:893
msgid "The resize maximum must be greater than the filesystem size.\n"
msgstr ""
"Storleksändringens maximum måste vara större än filsystemets storlek.\n"
msgstr "Storleksändringens maximum måste vara större än filsystemets storlek.\n"
#: misc/mke2fs.c:917
msgid "On-line resizing not supported with revision 0 filesystems\n"
@ -4668,8 +4584,7 @@ msgstr ""
"\n"
"Felaktiga flaggor angivna: %s\n"
"\n"
"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas "
"med\n"
"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas med\n"
"\tett likhetstecken (”=”).\n"
"\n"
"Giltiga utökade flaggor är:\n"
@ -4797,9 +4712,9 @@ msgid "flex_bg size must be a power of 2"
msgstr "storlek på flex_bg måste vara en multipel av 2"
#: misc/mke2fs.c:1589
#, fuzzy, c-format
#, c-format
msgid "flex_bg size (%lu) must be less than or equal to 2^31"
msgstr "storlek på flex_bg måste vara en multipel av 2"
msgstr "storlek på flex_bg (%lu) måste vara mindre än eller lika med 2³¹"
#: misc/mke2fs.c:1600
#, c-format
@ -4812,12 +4727,8 @@ msgid "invalid inode size - %s"
msgstr "ogiltig inodsstorlek - %s"
#: misc/mke2fs.c:1623
msgid ""
"Warning: -K option is deprecated and should not be used anymore. Use '-E "
"nodiscard' extended option instead!\n"
msgstr ""
"Varning: flaggan -K undanbedes och skall inte användas mera. Använd den "
"utökade flaggan \"-E nodiscard\" istället!\n"
msgid "Warning: -K option is deprecated and should not be used anymore. Use '-E nodiscard' extended option instead!\n"
msgstr "Varning: flaggan -K undanbedes och skall inte användas mera. Använd den utökade flaggan \"-E nodiscard\" istället!\n"
#: misc/mke2fs.c:1634
msgid "in malloc for bad_blocks_filename"
@ -4839,11 +4750,9 @@ msgid "bad revision level - %s"
msgstr "felaktig versionsnivå - %s"
#: misc/mke2fs.c:1684
#, fuzzy, c-format
#, c-format
msgid "while trying to create revision %d"
msgstr ""
"\n"
"\tvid försök att skapa journal"
msgstr "vid försök att skapa revision %d"
#: misc/mke2fs.c:1698
msgid "The -t option may only be used once"
@ -4925,11 +4834,8 @@ msgstr "när blockstorlek sattes; för liten för enheten\n"
#: misc/mke2fs.c:1949
#, c-format
msgid ""
"Warning: specified blocksize %d is less than device physical sectorsize %d\n"
msgstr ""
"Varning: angiven blockstorlek %d är mindre än enhetens fysiska sektorstorlek "
"%d\n"
msgid "Warning: specified blocksize %d is less than device physical sectorsize %d\n"
msgstr "Varning: angiven blockstorlek %d är mindre än enhetens fysiska sektorstorlek %d\n"
#: misc/mke2fs.c:1973
#, c-format
@ -4962,12 +4868,8 @@ msgid "invalid reserved blocks percent - %lf"
msgstr "ogiltig procentandel reserverade block - %lf"
#: misc/mke2fs.c:2047
msgid ""
"Extents MUST be enabled for a 64-bit filesystem. Pass -O extents to "
"rectify.\n"
msgstr ""
"Utsträckningar MÅSTE vara aktiverade på ett 64-bitars filsystem. Skicka -O "
"extents för att rätta.\n"
msgid "Extents MUST be enabled for a 64-bit filesystem. Pass -O extents to rectify.\n"
msgstr "Utsträckningar MÅSTE vara aktiverade på ett 64-bitars filsystem. Skicka -O extents för att rätta.\n"
#: misc/mke2fs.c:2067
msgid "The cluster size may not be smaller than the block size.\n"
@ -4989,10 +4891,8 @@ msgstr "%s justering är förskjuten med %lu byte.\n"
#: misc/mke2fs.c:2097
#, c-format
msgid ""
"This may result in very poor performance, (re)-partitioning suggested.\n"
msgstr ""
"Detta kan medföra väldigt dåliga prestanda, (om)partitionering föreslås.\n"
msgid "This may result in very poor performance, (re)-partitioning suggested.\n"
msgstr "Detta kan medföra väldigt dåliga prestanda, (om)partitionering föreslås.\n"
#: misc/mke2fs.c:2118
#, c-format
@ -5001,10 +4901,8 @@ msgstr "%d-byteblock för stort för systemet (max %d)"
#: misc/mke2fs.c:2122
#, c-format
msgid ""
"Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr ""
"Varning: %d-byteblock för stort för systemet (max %d), tvingas fortsätta\n"
msgid "Warning: %d-byte blocks too big for system (max %d), forced to continue\n"
msgstr "Varning: %d-byteblock för stort för systemet (max %d), tvingas fortsätta\n"
#: misc/mke2fs.c:2178
msgid "Can't support bigalloc feature without extents feature"
@ -5032,9 +4930,7 @@ msgstr ""
#: misc/mke2fs.c:2205
msgid "reserved online resize blocks not supported on non-sparse filesystem"
msgstr ""
"reserverade block för storleksändring under drift stöds inte på icke-glesa "
"filsystem"
msgstr "reserverade block för storleksändring under drift stöds inte på icke-glesa filsystem"
#: misc/mke2fs.c:2214
msgid "blocks per group count out of range"
@ -5042,8 +4938,7 @@ msgstr "antal block per grupp utanför giltigt intervall"
#: misc/mke2fs.c:2238
msgid "Flex_bg feature not enabled, so flex_bg size may not be specified"
msgstr ""
"Funktionen flex_gb är inte aktiverad, så fleg_bg-storleg kan inte anges"
msgstr "Funktionen flex_gb är inte aktiverad, så fleg_bg-storleg kan inte anges"
#: misc/mke2fs.c:2250
#, c-format
@ -5100,9 +4995,7 @@ msgstr "vid uppsättning av superblock"
#: misc/mke2fs.c:2610
msgid "Discard succeeded and will return 0s - skipping inode table wipe\n"
msgstr ""
"Utrangering lyckades och kommer returnera 0s — hoppar över rensning av "
"inodstabell\n"
msgstr "Utrangering lyckades och kommer returnera 0s — hoppar över rensning av inodstabell\n"
#: misc/mke2fs.c:2698
#, c-format
@ -5186,9 +5079,7 @@ msgstr ""
#: misc/mke2fs.c:2904
#, c-format
msgid "Multiple mount protection is enabled with update interval %d seconds.\n"
msgstr ""
"Skydd mot flerfaldig montering är aktiverat med uppdateringsintervall %d "
"sekunder.\n"
msgstr "Skydd mot flerfaldig montering är aktiverat med uppdateringsintervall %d sekunder.\n"
#: misc/mke2fs.c:2921
msgid "Writing superblocks and filesystem accounting information: "
@ -5258,8 +5149,7 @@ msgstr "Kör e2fsck på filsystemet.\n"
msgid ""
"Usage: %s [-c max_mounts_count] [-e errors_behavior] [-g group]\n"
"\t[-i interval[d|m|w]] [-j] [-J journal_options] [-l]\n"
"\t[-m reserved_blocks_percent] [-o [^]mount_options[,...]] [-p "
"mmp_update_interval]\n"
"\t[-m reserved_blocks_percent] [-o [^]mount_options[,...]] [-p mmp_update_interval]\n"
"\t[-r reserved_blocks_count] [-u user] [-C mount_count] [-L volume_label]\n"
"\t[-M last_mounted_dir] [-O [^]feature[,...]]\n"
"\t[-Q quota_options]\n"
@ -5368,9 +5258,7 @@ msgstr ""
#: misc/tune2fs.c:493
#, c-format
msgid "Multiple mount protection has been enabled with update interval %ds.\n"
msgstr ""
"Skydd mot flerfaldig montering har aktiverats med uppdateringsintervallet %d "
"s.\n"
msgstr "Skydd mot flerfaldig montering har aktiverats med uppdateringsintervallet %d s.\n"
#: misc/tune2fs.c:502
msgid ""
@ -5461,8 +5349,7 @@ msgid ""
"\n"
"Bad quota options specified.\n"
"\n"
"Following valid quota options are available (pass by separating with "
"comma):\n"
"Following valid quota options are available (pass by separating with comma):\n"
"\t[^]usrquota\n"
"\t[^]grpquota\n"
"\n"
@ -5471,8 +5358,7 @@ msgstr ""
"\n"
"Felaktigt kvotalternativ angivet.\n"
"\n"
"Följande giltiga kvotalternativ finns (skicka dem separerade med "
"kommatecken):\n"
"Följande giltiga kvotalternativ finns (skicka dem separerade med kommatecken):\n"
"\t[^]usrquota\n"
"\t[^]grpquota\n"
"\n"
@ -5544,14 +5430,9 @@ msgstr "mmp_update_interval är för stort: %lu\n"
#: misc/tune2fs.c:1220
#, c-format
msgid "Setting multiple mount protection update interval to %lu second\n"
msgid_plural ""
"Setting multiple mount protection update interval to %lu seconds\n"
msgstr[0] ""
"Sätter uppdateringsintervall för skydd mot flerfaldig montering till %lu "
"sekund\n"
msgstr[1] ""
"Sätter uppdateringsintervall för skydd mot flerfaldig montering till %lu "
"sekunder\n"
msgid_plural "Setting multiple mount protection update interval to %lu seconds\n"
msgstr[0] "Sätter uppdateringsintervall för skydd mot flerfaldig montering till %lu sekund\n"
msgstr[1] "Sätter uppdateringsintervall för skydd mot flerfaldig montering till %lu sekunder\n"
#: misc/tune2fs.c:1243
#, c-format
@ -5593,8 +5474,7 @@ msgstr ""
"\n"
"Felaktiga flaggor angivna.\n"
"\n"
"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas "
"med\n"
"Utökade flaggor separeras med komman, och kan ta ett argument som avdelas med\n"
"\tett likhetstecken (\"=\").\n"
"\n"
"Giltiga utökade flaggor är:\n"
@ -5664,8 +5544,7 @@ msgid ""
"MMP block magic is bad. Try to fix it by running:\n"
"'e2fsck -f %s'\n"
msgstr ""
"MMP-blockets magiska tal är felaktigt. Försök att rätta det genom att "
"köra:\n"
"MMP-blockets magiska tal är felaktigt. Försök att rätta det genom att köra:\n"
"\"e2fsck-f %s\"\n"
#: misc/tune2fs.c:1975
@ -5777,8 +5656,7 @@ msgid "Error in using clear_mmp. It must be used with -f\n"
msgstr "Fel vid användning av clear_mmp. Det måste användas med -f\n"
#: misc/tune2fs.c:2172
msgid ""
"The quota feature may only be changed when the filesystem is unmounted.\n"
msgid "The quota feature may only be changed when the filesystem is unmounted.\n"
msgstr "Kvotafunktionen kan endast ändras när filsystemet är omonterat.\n"
#: misc/tune2fs.c:2191
@ -6144,8 +6022,7 @@ msgid ""
"Usage: %s [-d debug_flags] [-f] [-F] [-M] [-P] [-p] device [new_size]\n"
"\n"
msgstr ""
"Användning: %s [-d felsökningflaggor] [-f] [-F] [-M] [-P] [-p] enhet "
"[ny_storlek]\n"
"Användning: %s [-d felsökningflaggor] [-f] [-F] [-M] [-P] [-p] enhet [ny_storlek]\n"
"\n"
#: resize/main.c:66
@ -6348,12 +6225,8 @@ msgstr "Vid försök att öppna grupp nr. %d"
#: resize/online.c:298
#, c-format
msgid ""
"Filesystem at %s is mounted on %s, and on-line resizing is not supported on "
"this system.\n"
msgstr ""
"Filsystemet på %s är monterat på %s, och storleksändring on-line stöds inte "
"på detta system.\n"
msgid "Filesystem at %s is mounted on %s, and on-line resizing is not supported on this system.\n"
msgstr "Filsystemet på %s är monterat på %s, och storleksändring on-line stöds inte på detta system.\n"
#: resize/resize2fs.c:402
#, c-format
@ -6385,8 +6258,7 @@ msgid "Should never happen: resize inode corrupt!\n"
msgstr "Skulle aldrig inträffa: storleksändringsinoden trasig!\n"
#: lib/ext2fs/ext2_err.c:11
#, fuzzy
msgid "EXT2FS Library version 1.42.11"
msgid "EXT2FS Library version 1.42.10"
msgstr "EXT2FS-bibliotek version 1.42.10"
#: lib/ext2fs/ext2_err.c:12
@ -6535,8 +6407,7 @@ msgstr "Försök att läsa block från filsystemet resulterade i en kort läsnin
#: lib/ext2fs/ext2_err.c:48
msgid "Attempt to write block to filesystem resulted in short write"
msgstr ""
"Försök att skriva block till filsystemet resulterade i en kort skrivning"
msgstr "Försök att skriva block till filsystemet resulterade i en kort skrivning"
#: lib/ext2fs/ext2_err.c:49
msgid "No free space in the directory"
@ -6592,13 +6463,11 @@ msgstr "Otillåtet inodsnummer skickat till ext2fs_test_inode_bitmap"
#: lib/ext2fs/ext2_err.c:62
msgid "Attempt to fudge end of block bitmap past the real end"
msgstr ""
"Försök att fuska till slutet av blockbitkartan bortom det riktiga slutet"
msgstr "Försök att fuska till slutet av blockbitkartan bortom det riktiga slutet"
#: lib/ext2fs/ext2_err.c:63
msgid "Attempt to fudge end of inode bitmap past the real end"
msgstr ""
"Försök att fuska till slutet av inodsbitkartan bortom det riktiga slutet"
msgstr "Försök att fuska till slutet av inodsbitkartan bortom det riktiga slutet"
#: lib/ext2fs/ext2_err.c:64
msgid "Illegal indirect block found"
@ -6934,8 +6803,7 @@ msgstr "I/O-kanaler stödjer inte 64-bitars blocknummer"
#: lib/ext2fs/ext2_err.c:147
msgid "Can't check if filesystem is mounted due to missing mtab file"
msgstr ""
"Kan inte kontrollera om filsystem är monterade för att mtab-filen saknas"
msgstr "Kan inte kontrollera om filsystem är monterade för att mtab-filen saknas"
#: lib/ext2fs/ext2_err.c:148
msgid "Filesystem too large to use legacy bitmaps"
@ -6995,8 +6863,7 @@ msgstr "Katalogblocksumman stämmer inte med katalogblocket"
#: lib/ext2fs/ext2_err.c:162
msgid "Extended attribute block checksum does not match block"
msgstr ""
"Kontrollsumman för blocket för utökade attribut stämmer inte med blocket"
msgstr "Kontrollsumman för blocket för utökade attribut stämmer inte med blocket"
#: lib/ext2fs/ext2_err.c:163
msgid "Superblock checksum does not match superblock"

View File

@ -441,8 +441,9 @@ int main (int argc, char ** argv)
exit(1);
}
if (new_size == ext2fs_blocks_count(fs->super)) {
fprintf(stderr, _("The filesystem is already %llu blocks "
"long. Nothing to do!\n\n"), new_size);
fprintf(stderr, _("The filesystem is already %llu (%dk) "
"blocks long. Nothing to do!\n\n"), new_size,
fs->blocksize / 1024);
exit(0);
}
if (mount_flags & EXT2_MF_MOUNTED) {
@ -468,8 +469,8 @@ int main (int argc, char ** argv)
ext2fs_close_free(&fs);
exit(1);
}
printf(_("The filesystem on %s is now %llu blocks long.\n\n"),
device_name, new_size);
printf(_("The filesystem on %s is now %llu (%dk) blocks long.\n\n"),
device_name, new_size, fs->blocksize / 1024);
if ((st_buf.st_size > new_file_size) &&
(fd > 0)) {

View File

@ -29,9 +29,10 @@ program will resize ext2, ext3, or ext4 file systems. It can be used to
enlarge or shrink an unmounted file system located on
.IR device .
If the filesystem is mounted, it can be used to expand the size of the
mounted filesystem, assuming the kernel supports on-line resizing. (As
of this writing, the Linux 2.6 kernel supports on-line resize for
filesystems mounted using ext3 and ext4.).
mounted filesystem, assuming the kernel and the file system supports
on-line resizing. (Modern Linux 2.6 kernels will support on-line resize
for file systems mounted using ext3 and ext4; ext3 file systems will
require the use of file systems with the resize_inode feature enabled.)
.PP
The
.I size

View File

@ -5,7 +5,7 @@ Inode: 1550 Type: regular Mode: 0644 Flags: 0x0
Exit status is 0
resize2fs test.img 5M
Resizing the filesystem on test.img to 5120 (1k) blocks.
The filesystem on test.img is now 5120 blocks long.
The filesystem on test.img is now 5120 (1k) blocks long.
Exit status is 0
debugfs -R ''stat file'' test.img 2>&1 | grep ''^Inode\|in inode body\|name = ''

View File

@ -1,7 +1,7 @@
resize2fs test
resize2fs -M test.img
Resizing the filesystem on test.img to 1124 (1k) blocks.
The filesystem on test.img is now 1124 blocks long.
The filesystem on test.img is now 1124 (1k) blocks long.
Exit status is 0

View File

@ -3,7 +3,7 @@ resize2fs -p test.img 10000
Resizing the filesystem on test.img to 10000 (1k) blocks.
Begin pass 1 (max = 35)
Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
The filesystem on test.img is now 9985 blocks long.
The filesystem on test.img is now 9985 (1k) blocks long.
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
@ -299,7 +299,7 @@ resize2fs -p test.img 20000
Resizing the filesystem on test.img to 20000 (1k) blocks.
Begin pass 1 (max = 39)
Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
The filesystem on test.img is now 19969 blocks long.
The filesystem on test.img is now 19969 (1k) blocks long.
Filesystem did not have a UUID; generating one.
@ -833,7 +833,7 @@ resize2fs -p test.img 30000
Resizing the filesystem on test.img to 30000 (1k) blocks.
Begin pass 1 (max = 39)
Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
The filesystem on test.img is now 29953 blocks long.
The filesystem on test.img is now 29953 (1k) blocks long.
Filesystem did not have a UUID; generating one.
@ -1603,7 +1603,7 @@ resize2fs -p test.img 40000
Resizing the filesystem on test.img to 40000 (1k) blocks.
Begin pass 1 (max = 40)
Extending the inode table ----------------------------------------XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
The filesystem on test.img is now 40000 blocks long.
The filesystem on test.img is now 40000 (1k) blocks long.
Filesystem did not have a UUID; generating one.

View File

@ -1,7 +1,7 @@
mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 16384
resize2fs test.img 65536
Resizing the filesystem on test.img to 65536 (1k) blocks.
The filesystem on test.img is now 65536 blocks long.
The filesystem on test.img is now 65536 (1k) blocks long.
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
@ -448,7 +448,7 @@ Group 63: (Blocks 64513-65535)
mke2fs -q -F -O resize_inode -o Linux -b 1024 -g 1024 test.img 65536
resize2fs test.img 16384
Resizing the filesystem on test.img to 16384 (1k) blocks.
The filesystem on test.img is now 16384 blocks long.
The filesystem on test.img is now 16384 (1k) blocks long.
Pass 1: Checking inodes, blocks, and sizes
Pass 2: Checking directory structure
@ -600,7 +600,7 @@ Group 15: (Blocks 15361-16383)
--------------------------------
resize2fs test.img 165536
Resizing the filesystem on test.img to 165536 (1k) blocks.
The filesystem on test.img is now 165536 blocks long.
The filesystem on test.img is now 165536 (1k) blocks long.
Filesystem did not have a UUID; generating one.

View File

@ -8,4 +8,4 @@
*/
#define E2FSPROGS_VERSION "1.43-WIP"
#define E2FSPROGS_DATE "09-Jul-2014"
#define E2FSPROGS_DATE "25-Aug-2014"