diff -ur cvs-parted/libparted/fs_fat/resize.c parted-new/libparted/fs_fat/resize.c --- cvs-parted/libparted/fs_fat/resize.c 2005-03-28 15:31:30.000000000 +0200 +++ parted-new/libparted/fs_fat/resize.c 2005-03-28 16:10:11.000000000 +0200 @@ -379,7 +379,7 @@ } /* - constructs the new fat for the resized file system. + Constructs the new fat for the resized file system. */ static int fat_construct_new_fat (FatOpContext* ctx) diff -ur cvs-parted/libparted/fs_hfs/DOC parted-new/libparted/fs_hfs/DOC --- cvs-parted/libparted/fs_hfs/DOC 2005-02-19 00:14:57.000000000 +0100 +++ parted-new/libparted/fs_hfs/DOC 2005-03-28 16:23:47.000000000 +0200 @@ -36,12 +36,12 @@ - simplicity - avoiding memory allocation while resizing -This cache involves quite big worst cases memory consumption, but without it -the time needed to complete the operation in theses worst cases would be huge +This cache involves a quite big worst-case memory consumption, but without it +the time needed to complete the operation in these worst cases would be huge anyway (maybe several years...) so this isn't really an issue. The cache size -is near proportional to the number of files you have, or if you have very few -files to the size of your volume, so worst cases situations occure when you -fill a drive with millions of < 4 ko files :p For this very special usage you +is nearly proportional to the number of files you have or, if you have very few +files, to the size of your volume, so worst-case situations occur when you +fill a drive with millions of < 4 kB files :p For this very special usage you will just need a very special amount of RAM (on typical systems about (FS size) / 256 )... On a more "normal" volume it's about (# of files) * 20 bytes. With very few files it's about (FS Size) / 1024 / 256. diff -ur cvs-parted/libparted/fs_hfs/file_plus.c parted-new/libparted/fs_hfs/file_plus.c --- cvs-parted/libparted/fs_hfs/file_plus.c 2005-03-28 15:31:31.000000000 +0200 +++ parted-new/libparted/fs_hfs/file_plus.c 2005-03-28 16:10:11.000000000 +0200 @@ -211,7 +211,7 @@ ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, _("Could not find sector %lli of %s file with " - "CNID %X."), + "CNID %X."), sector, "HFS+", PED_BE32_TO_CPU(file->CNID)); return 0; } diff -ur cvs-parted/libparted/fs_hfs/hfs.c parted-new/libparted/fs_hfs/hfs.c --- cvs-parted/libparted/fs_hfs/hfs.c 2005-03-28 15:31:31.000000000 +0200 +++ parted-new/libparted/fs_hfs/hfs.c 2005-03-28 16:10:11.000000000 +0200 @@ -819,7 +819,7 @@ (HfsPrivateGenericKey*) &key, NULL, 0, &ref)) { ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL, - _("An error occured while looking for the mandatory " + _("An error occurred while looking for the mandatory " "bad blocks file.")); return 0; } diff -ur cvs-parted/libparted/fs_hfs/reloc.c parted-new/libparted/fs_hfs/reloc.c --- cvs-parted/libparted/fs_hfs/reloc.c 2005-03-28 15:31:31.000000000 +0200 +++ parted-new/libparted/fs_hfs/reloc.c 2005-03-28 16:06:59.000000000 +0200 @@ -499,8 +499,8 @@ case PED_CPU_TO_BE32 (HFS_XTENT_ID) : if (ped_exception_throw (PED_EXCEPTION_WARNING, PED_EXCEPTION_IGNORE_CANCEL, - _("The extents overflow file should not " - "contain its own extents... you " + _("The extents overflow file must not " + "contain its own extents! You " "should check the file system.")) != PED_EXCEPTION_IGNORE) return 0; diff -ur cvs-parted/libparted/libparted.c parted-new/libparted/libparted.c --- cvs-parted/libparted/libparted.c 2005-03-28 15:31:29.000000000 +0200 +++ parted-new/libparted/libparted.c 2005-03-28 16:18:04.000000000 +0200 @@ -253,14 +253,14 @@ ped_exception_throw ( PED_EXCEPTION_INFORMATION, PED_EXCEPTION_OK, - "Dodgy malloc(%x) == %p occured (active==%d)", + "Dodgy malloc(%x) == %p occurred (active==%d)", size, ptr, dodgy_memory_active[i]); dodgy_memory_active[i]++; } else { ped_exception_throw ( PED_EXCEPTION_INFORMATION, PED_EXCEPTION_OK, - "Dodgy free(%p) occured (active==%d)", + "Dodgy free(%p) occurred (active==%d)", ptr, dodgy_memory_active[i]); dodgy_memory_active[i]--; }