diff -ur cvs-parted/libparted/disk.c parted-new/libparted/disk.c
--- cvs-parted/libparted/disk.c	2005-03-22 13:34:06.000000000 +0100
+++ parted-new/libparted/disk.c	2005-03-22 18:39:22.042265176 +0100
@@ -1342,7 +1342,7 @@
 			ped_exception_throw (
 				PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_CANCEL,
-				"Too many primary partitions.");
+				_("Too many primary partitions."));
 			return 0;
 		}
 	}
@@ -1375,7 +1375,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("Can't have more than one extended partition on %s"),
+			_("Can't have more than one extended partition on %s."),
 			disk->dev->path);
 		return 0;
 	}
@@ -1418,7 +1418,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("Can't have overlapping partitions"));
+			_("Can't have overlapping partitions."));
 		return 0;
 	}
 
@@ -1780,7 +1780,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_BUG,
 			PED_EXCEPTION_CANCEL,
-			_("Unknown flag partition flag, %d."),
+			_("Unknown partition flag, %d."),
 			flag);
 		return NULL;
 	}
diff -ur cvs-parted/libparted/disk_amiga.c parted-new/libparted/disk_amiga.c
--- cvs-parted/libparted/disk_amiga.c	2005-03-08 19:40:42.000000000 +0100
+++ parted-new/libparted/disk_amiga.c	2005-03-22 18:39:22.043265024 +0100
@@ -699,7 +699,7 @@
 	{
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("%s : Failed to list badblocks."), __func__);
+			_("%s : Failed to list bad blocks."), __func__);
 		goto error_free_table;
 	}
 	if (_amiga_find_free_blocks(disk, table, block,
@@ -707,7 +707,7 @@
 	{
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("%s : Failed to list partitionblocks."), __func__);
+			_("%s : Failed to list partition blocks."), __func__);
 		goto error_free_table;
 	}
 	if (_amiga_find_free_blocks(disk, table, block,
@@ -715,7 +715,7 @@
 	{
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("%s : Failed to list filesystemblocks."), __func__);
+			_("%s : Failed to list filesystem blocks."), __func__);
 		goto error_free_table;
 	}
 	if (_amiga_find_free_blocks(disk, table, block,
@@ -723,7 +723,7 @@
 	{
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("%s : Failed to list bootblocks."), __func__);
+			_("%s : Failed to list boot blocks."), __func__);
 		goto error_free_table;
 	}
 
@@ -750,7 +750,7 @@
 				block_num);
 			goto error_free_table;
 			/* WARNING : If we fail here, we stop everything,
-			 * and the partition table is lost. A Better
+			 * and the partition table is lost. A better
 			 * solution should be found, using the second
 			 * half of the hardblocks to not overwrite the
 			 * old partition table. It becomes problematic
@@ -1077,7 +1077,7 @@
 	/* failed to allocate a number */
 #ifndef DISCOVER_ONLY
 	ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-		_("%s : Unable to allocate a partition"), __func__);
+		_("%s : Unable to allocate a partition."), __func__);
 #endif
 	return 0;
 }
diff -ur cvs-parted/libparted/disk_bsd.c parted-new/libparted/disk_bsd.c
--- cvs-parted/libparted/disk_bsd.c	2004-08-16 00:45:28.000000000 +0200
+++ parted-new/libparted/disk_bsd.c	2005-03-22 18:39:22.044264872 +0100
@@ -522,7 +522,7 @@
 	/* failed to allocate a number */
 #ifndef DISCOVER_ONLY
 	ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			     _("Unable to allocate a bsd disklabel slot"));
+			     _("Unable to allocate a bsd disklabel slot."));
 #endif
 	return 0;
 }
diff -ur cvs-parted/libparted/disk_dos.c parted-new/libparted/disk_dos.c
--- cvs-parted/libparted/disk_dos.c	2005-01-06 00:27:07.000000000 +0100
+++ parted-new/libparted/disk_dos.c	2005-03-22 18:39:22.045264720 +0100
@@ -778,7 +778,7 @@
 	if (PED_LE16_TO_CPU (table.magic) != MSDOS_MAGIC) {
 		if (ped_exception_throw (
 			PED_EXCEPTION_ERROR, PED_EXCEPTION_IGNORE_CANCEL,
-			_("Invalid partition table on %s - wrong signature %x"),
+			_("Invalid partition table on %s -- wrong signature %x."),
 			disk->dev->path,
 			PED_LE16_TO_CPU (table.magic))
 				!= PED_EXCEPTION_IGNORE)
@@ -1260,8 +1260,8 @@
 			ped_exception_throw (
 				PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_CANCEL,
-				"Extended partitions can not be hidden on "
-				"msdos disk labels.");
+				_("Extended partitions cannot be hidden on "
+				  "msdos disk labels."));
 			return 0;
 		}
 		dos_data->hidden = state;
diff -ur cvs-parted/libparted/disk_dvh.c parted-new/libparted/disk_dvh.c
--- cvs-parted/libparted/disk_dvh.c	2004-12-07 21:12:24.000000000 +0100
+++ parted-new/libparted/disk_dvh.c	2005-03-22 18:39:22.046264568 +0100
@@ -197,7 +197,7 @@
 		PED_EXCEPTION_WARNING,
 		PED_EXCEPTION_FIX + PED_EXCEPTION_IGNORE_CANCEL,
 		_("%s has no extended partition (volume header "
-		  "partition).  If you ignore, then any boot volumes "
+		  "partition).  If you ignore this, then any boot volumes "
 		  "will be deleted."),
 		disk->dev->path)) {
 	case PED_EXCEPTION_UNHANDLED:
diff -ur cvs-parted/libparted/disk_gpt.c parted-new/libparted/disk_gpt.c
--- cvs-parted/libparted/disk_gpt.c	2005-03-08 19:40:42.000000000 +0100
+++ parted-new/libparted/disk_gpt.c	2005-03-22 18:39:22.046264568 +0100
@@ -309,7 +309,7 @@
 			_("%s contains GPT signatures, indicating that it has "
 			  "a GPT table.  However, it does not have a valid "
 			  "fake msdos partition table, as it should.  Perhaps "
-			  "it was corrupted - possibly by a program that "
+			  "it was corrupted -- possibly by a program that "
 			  "doesn't understand GPT partition tables.  Or "
 			  "perhaps you deleted the GPT table, and are now "
 			  "using an msdos partition table.  Is this a GPT "
@@ -617,7 +617,7 @@
 				PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_OK_CANCEL,
 				_("The primary GPT table is corrupt, but the "
-				  "backup appears ok, so that will be used."))
+				  "backup appears OK, so that will be used."))
 				    == PED_EXCEPTION_CANCEL)
 				goto error;
 		} else {
@@ -626,7 +626,7 @@
 				PED_EXCEPTION_CANCEL,
 				_("Both the primary and backup GPT tables "
 				  "are corrupt.  Try making a fresh table, "
-				  "and using Parted's rescue feature, to "
+				  "and using Parted's rescue feature to "
 				  "recover partitions."));
 			goto error;
 		}
diff -ur cvs-parted/libparted/disk_mac.c parted-new/libparted/disk_mac.c
--- cvs-parted/libparted/disk_mac.c	2005-03-22 13:34:07.000000000 +0100
+++ parted-new/libparted/disk_mac.c	2005-03-22 18:39:22.048264264 +0100
@@ -520,7 +520,7 @@
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
 			_("The data region doesn't start at the start "
-			  "of the partition"));
+			  "of the partition."));
 		goto error_destroy_part;
 	}
 #endif /* !DISCOVER_ONLY */
@@ -537,7 +537,7 @@
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
 			_("The boot region doesn't start at the start "
-			  "of the partition"));
+			  "of the partition."));
 		goto error_destroy_part;
 	}
 #endif
@@ -728,7 +728,7 @@
 				PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_IGNORE_CANCEL,
 				_("Conflicting partition map entry sizes!  "
-				  "Entry 1 says it's %d, but entry %d says its "
+				  "Entry 1 says it's %d, but entry %d says it's "
 				  "%d!"),
 				last_part_entry_num,
 				_rawpart_get_partmap_size (&raw_part, disk))
@@ -754,7 +754,7 @@
 			    && ped_exception_throw (
 					PED_EXCEPTION_ERROR,
 					PED_EXCEPTION_IGNORE_CANCEL,
-					_("Weird - 2 partitions map entries!"))
+					_("Weird -- 2 partitions map entries!"))
 			    != PED_EXCEPTION_IGNORE)
 				goto error_delete_all;
 
@@ -1331,7 +1331,7 @@
 	ped_exception_throw (
 		PED_EXCEPTION_ERROR,
 		PED_EXCEPTION_CANCEL,
-		_("Can't add another partition - partition map is too small!"));
+		_("Can't add another partition -- partition map is too small!"));
 #endif
 
 	return 0;
diff -ur cvs-parted/libparted/disk_pc98.c parted-new/libparted/disk_pc98.c
--- cvs-parted/libparted/disk_pc98.c	2005-03-08 19:40:42.000000000 +0100
+++ parted-new/libparted/disk_pc98.c	2005-03-22 18:39:22.048264264 +0100
@@ -351,7 +351,7 @@
 	if (!pc98_check_magic(&table)) {
 		if (ped_exception_throw (
 			PED_EXCEPTION_ERROR, PED_EXCEPTION_IGNORE_CANCEL,
-			_("Invalid partition table on %s"),
+			_("Invalid partition table on %s."),
 			disk->dev->path))
 			goto error;
 	}
@@ -404,7 +404,7 @@
 				PED_EXCEPTION_NO_FEATURE,
 				PED_EXCEPTION_CANCEL,
 				_("Partition %d isn't aligned to cylinder "
-				  "boundaries.  Need to add support for this."),
+				  "boundaries.  Still unsupported."),
 				part->num);
 			goto error;
 		}
@@ -482,7 +482,7 @@
 		    PED_EXCEPTION_NO_FEATURE,
 		    PED_EXCEPTION_CANCEL,
 		    _("Partition %d isn't aligned to cylinder "
-		      "boundaries.  Need to add support for this."),
+		      "boundaries.  Still unsupported."),
 		    part->num);
 		return 0;
 	}
diff -ur cvs-parted/libparted/disk_sun.c parted-new/libparted/disk_sun.c
--- cvs-parted/libparted/disk_sun.c	2005-03-08 19:40:42.000000000 +0100
+++ parted-new/libparted/disk_sun.c	2005-03-22 18:39:22.049264112 +0100
@@ -258,8 +258,8 @@
 		if (ped_exception_throw (
 				PED_EXCEPTION_WARNING,
 				PED_EXCEPTION_IGNORE_CANCEL,
-				_("The disk CHS geometry (%d,%d,%d) does not "
-				  "match the geometry stored on the disk "
+				_("The real disk CHS geometry (%d,%d,%d) does "
+				  "not match the geometry stored in the disk "
 				  "label (%d,%d,%d)."),
 				dev->bios_geom.cylinders,
 			       	dev->bios_geom.heads,
diff -ur cvs-parted/libparted/filesys.c parted-new/libparted/filesys.c
--- cvs-parted/libparted/filesys.c	2005-01-05 11:45:18.000000000 +0100
+++ parted-new/libparted/filesys.c	2005-03-22 18:39:22.056263048 +0100
@@ -298,7 +298,7 @@
 	type = ped_file_system_probe (geom);
 	if (!type) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-				     _("Could not detect file system."));
+				     _("Could not detect a filesystem."));
 		goto error_close_dev;
 	}
 
@@ -309,7 +309,7 @@
 		if (ped_exception_throw (
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_IGNORE_CANCEL,
-			_("The file system is bigger than it's volume!"))
+			_("The filesystem is bigger than its volume!"))
 				!= PED_EXCEPTION_IGNORE)
 			goto error_destroy_probed_geom;
 	}
@@ -317,7 +317,7 @@
 	if (!type->ops->open) {
 		ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
 				     PED_EXCEPTION_CANCEL,
-				     _("Support for opening %s file systems "
+				     _("Support for opening %s filesystems "
 				       "is not implemented yet."),
 				     type->name);
 		goto error_destroy_probed_geom;
@@ -349,7 +349,7 @@
 	if (!type->ops->create) {
 		ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
 				     PED_EXCEPTION_CANCEL,
-				     _("Support for creating %s file systems "
+				     _("Support for creating %s filesystems "
 				       "is not implemented yet."),
 				     type->name);
 		goto error;
@@ -397,7 +397,7 @@
 	if (!fs->type->ops->check) {
 		ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
 				     PED_EXCEPTION_CANCEL,
-				     _("Support for checking %s file systems "
+				     _("Support for checking %s filesystems "
 				       "is not implemented yet."),
 				     fs->type->name);
 		return 0;
@@ -474,7 +474,7 @@
 	if (!new_fs)
 		goto error;
 
-	ped_timer_set_state_name (timer, _("growing file system"));
+	ped_timer_set_state_name (timer, _("growing filesystem"));
 
 	sub_timer = ped_timer_new_nested (timer, 0.05);
 	if (!ped_file_system_resize (new_fs, geom, sub_timer))
@@ -525,21 +525,19 @@
 			ped_exception_throw (
 				PED_EXCEPTION_NO_FEATURE,
 				PED_EXCEPTION_CANCEL,
-				_("Direct support for copying file systems is "
-				  "not yet implemented for %s.  However, "
-				  "support for resizing implemented.  "
-				  "Therefore, the file system can be copied if "
-				  "the new partition is at least as big as the "
-				  "old one.  So, either shrink the partition "
-				  "you are trying to copy, or copy to a bigger "
-				  "partition."),
+				_("Support for directly copying %s filesystems "
+				  "to a different size is not implemented yet.  "
+				  "But it is possible to resize them.  "
+				  "So, either first shrink the partition you "
+				  "are trying to copy, or copy it to another, "
+				  "bigger partition."),
 				fs->type->name);
 			goto error_close_dev;
 		} else {
 			ped_exception_throw (
 				PED_EXCEPTION_NO_FEATURE,
 				PED_EXCEPTION_CANCEL,
-				_("Support for copying %s file systems is not "
+				_("Support for copying %s filesystems is not "
 				  "implemented yet."),
 				fs->type->name);
 			goto error_close_dev;
@@ -565,7 +563,7 @@
 	if (!fs->type->ops->resize) {
 		ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
 				     PED_EXCEPTION_CANCEL,
-				     _("Support for resizing %s file systems "
+				     _("Support for resizing %s filesystems "
 				       "is not implemented yet."),
 				     fs->type->name);
 		return 0;
diff -ur cvs-parted/libparted/fs_amiga/amiga.c parted-new/libparted/fs_amiga/amiga.c
--- cvs-parted/libparted/fs_amiga/amiga.c	2005-01-05 14:18:53.000000000 +0100
+++ parted-new/libparted/fs_amiga/amiga.c	2005-03-22 18:39:22.057262896 +0100
@@ -347,7 +347,7 @@
 		if (!ped_device_read (geom->dev, part, (PedSector)partblock, 1)) {
 			switch (ped_exception_throw(PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_CANCEL,
-				_("%s : Failed to to read partition block %llu\n"),
+				_("%s : Failed to read partition block %llu\n"),
 				__func__, (PedSector)partblock))
 			{
 				case PED_EXCEPTION_CANCEL :
diff -ur cvs-parted/libparted/fs_ext2/ext2.c parted-new/libparted/fs_ext2/ext2.c
--- cvs-parted/libparted/fs_ext2/ext2.c	2004-06-13 08:35:11.000000000 +0200
+++ parted-new/libparted/fs_ext2/ext2.c	2005-03-22 18:39:22.058262744 +0100
@@ -750,8 +750,8 @@
 		if (ped_exception_throw (
 			PED_EXCEPTION_ERROR, PED_EXCEPTION_IGNORE_CANCEL,
 			_("Filesystem was not cleanly unmounted!  "
-			  "You should e2fsck.  Modifying an unclean filesystem "
-			  "could cause severe corruption."))
+			  "You should run e2fsck.  Modifying an unclean "
+			  "filesystem could cause severe corruption."))
 				!= PED_EXCEPTION_IGNORE)
 			goto error_free_fs;
 	}
@@ -769,7 +769,7 @@
 			    EXT2_FEATURE_RO_COMPAT_LARGE_FILE)))
 	{
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-		     _("Filesystem has incompatible feature enabled"));
+		     _("Filesystem has an incompatible feature enabled."));
 		goto error_free_fs;
 	}
 
diff -ur cvs-parted/libparted/fs_ext2/ext2_block_relocator.c parted-new/libparted/fs_ext2/ext2_block_relocator.c
--- cvs-parted/libparted/fs_ext2/ext2_block_relocator.c	2004-06-13 08:35:11.000000000 +0200
+++ parted-new/libparted/fs_ext2/ext2_block_relocator.c	2005-03-22 18:39:22.058262744 +0100
@@ -152,7 +152,7 @@
 	if (ent->refblock)
 	{
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("Cross-linked blocks found! better go run e2fsck "
+			_("Cross-linked blocks found!  Better run e2fsck "
 			  "first!"));
 		return 0;
 	}
@@ -486,7 +486,7 @@
 	if (!(block->refblock || block->refoffset))
 	{
 		ped_exception_throw (PED_EXCEPTION_BUG, PED_EXCEPTION_CANCEL,
-				     _("Block %i has no reference?  Weird"),
+				     _("Block %i has no reference?  Weird."),
 				     block->num);
 		return 0;
 	}
diff -ur cvs-parted/libparted/fs_ext2/ext2_inode_relocator.c parted-new/libparted/fs_ext2/ext2_inode_relocator.c
--- cvs-parted/libparted/fs_ext2/ext2_inode_relocator.c	2004-06-13 08:35:11.000000000 +0200
+++ parted-new/libparted/fs_ext2/ext2_inode_relocator.c	2005-03-22 18:39:22.059262592 +0100
@@ -112,7 +112,7 @@
 	{
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
 			_("Found an inode with a incorrect link count.  "
-			  "Better go run e2fsck first."));
+			  "Better run e2fsck first!"));
 		return 0;
 	}
 
diff -ur cvs-parted/libparted/fs_ext2/ext2_mkfs.c parted-new/libparted/fs_ext2/ext2_mkfs.c
--- cvs-parted/libparted/fs_ext2/ext2_mkfs.c	2005-03-14 18:16:41.000000000 +0100
+++ parted-new/libparted/fs_ext2/ext2_mkfs.c	2005-03-22 18:39:22.059262592 +0100
@@ -556,7 +556,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("File system too small for ext2."));
+			_("Filesystem too small for ext2."));
 		goto error;
 	}
 
diff -ur cvs-parted/libparted/fs_ext2/ext2_resize.c parted-new/libparted/fs_ext2/ext2_resize.c
--- cvs-parted/libparted/fs_ext2/ext2_resize.c	2004-06-13 08:35:11.000000000 +0200
+++ parted-new/libparted/fs_ext2/ext2_resize.c	2005-03-22 18:39:22.060262440 +0100
@@ -221,7 +221,7 @@
 	if (EXT2_SUPER_FREE_BLOCKS_COUNT(fs->sb) < groupsize - admin)
 	{
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("Filesystem is too occupied to remove a group!"));
+			_("Filesystem is too full to remove a group!"));
 
 		return 0;
 	}
@@ -241,8 +241,8 @@
 		    EXT2_SUPER_INODES_PER_GROUP(fs->sb))
 		{
 			fprintf(stderr,
-				"ext2_del_group: this should not "
-				"happen anymore!\n");
+				_("Internal error: ext2_del_group should not "
+				  "happen anymore!\n"));
 
 			return 0;
 		}
@@ -526,8 +526,8 @@
 	    - EXT2_SUPER_FREE_BLOCKS_COUNT(fs->sb) > newsize)
 	{
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("Your filesystem is too occupied to resize it to %i "
-			  "blocks. Sorry."), newsize);
+			_("Your filesystem is too full to resize it to %i "
+			  "blocks.  Sorry."), newsize);
 		return 0;
 	}
 
@@ -536,8 +536,8 @@
 	    		> newgroups * EXT2_SUPER_INODES_PER_GROUP(fs->sb))
 	{
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("Your filesystem has too much occupied inodes to "
-			  "resize it to %i blocks. Sorry."), newsize);
+			_("Your filesystem has too many occupied inodes to "
+			  "resize it to %i blocks.  Sorry."), newsize);
 		return 0;
 	}
 
@@ -602,7 +602,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
 			_("Filesystem was not cleanly unmounted!  "
-			  "You should e2fsck."));
+			  "You should run e2fsck."));
 		return 0;
 	}
 
@@ -610,8 +610,8 @@
 			& EXT2_FEATURE_COMPAT_HAS_DIR_INDEX) {
 		if (ped_exception_throw (
 			PED_EXCEPTION_WARNING, PED_EXCEPTION_IGNORE_CANCEL,
-			_("The file system has the 'dir_index' feature "
-			  "enabled.  Parted can only resize the file system "
+			_("The filesystem has the 'dir_index' feature "
+			  "enabled.  Parted can only resize the filesystem "
 			  "if it disables this feature.  You can enable it "
 			  "later by running 'tune2fs -O dir_index DEVICE' "
 			  "and then 'e2fsck -fD DEVICE'."))
diff -ur cvs-parted/libparted/fs_fat/bootsector.c parted-new/libparted/fs_fat/bootsector.c
--- cvs-parted/libparted/fs_fat/bootsector.c	2004-11-28 22:50:29.000000000 +0100
+++ parted-new/libparted/fs_fat/bootsector.c	2005-03-22 18:39:22.061262288 +0100
@@ -45,42 +45,42 @@
 
 	if (PED_LE16_TO_CPU (bs->boot_sign) != 0xAA55) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("File system has an invalid signature for a FAT "
-			  "file systems."));
+			_("Filesystem has an invalid signature for a FAT "
+			  "filesystem."));
 		return 0;
 	}
 
 	if (!bs->system_id[0]) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("File system has an invalid signature for a FAT "
-			  "file system."));
+			_("Filesystem has an invalid signature for a FAT "
+			  "filesystem."));
 		return 0;
 	}
 
 	if (!bs->sector_size || PED_LE16_TO_CPU (bs->sector_size) % 512) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("File system has an invalid sector size for a FAT "
-			  "file system."));
+			_("Filesystem has an invalid sector size for a FAT "
+			  "filesystem."));
 		return 0;
 	}
 
 	if (!bs->cluster_size) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("File system has an invalid cluster size for a FAT "
-			  "file system."));
+			_("Filesystem has an invalid cluster size for a FAT "
+			  "filesystem."));
 		return 0;
 	}
 
 	if (!bs->reserved) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("File system has an invalid number of reserved "
+			_("Filesystem has an invalid number of reserved "
 			  "sectors for a FAT filesystem."));
 		return 0;
 	}
 
 	if (bs->fats < 1 || bs->fats > 4) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("File system has an invalid number of FATS."));
+			_("Filesystem has an invalid number of FATs."));
 		return 0;
 	}
 
@@ -135,9 +135,9 @@
 		if (ped_exception_throw (
 			PED_EXCEPTION_BUG,
 			PED_EXCEPTION_IGNORE_CANCEL,
-			_("This file system has a logical sector size of %d.  "
-			"GNU Parted is known not to work properly with sector "
-			"sizes other than 512 bytes."),
+			_("This filesystem has a logical sector size of %d.  "
+			  "GNU Parted is known not to work properly with "
+			  "sector sizes other than 512 bytes."),
 			(int) PED_LE16_TO_CPU (bs->sector_size))
 				!= PED_EXCEPTION_IGNORE)
 			return 0;
@@ -160,11 +160,11 @@
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_FIX + PED_EXCEPTION_IGNORE
 			+ PED_EXCEPTION_CANCEL,
-			_("The file system's CHS geometry is (%d, %d, %d), "
+			_("The filesystem's CHS geometry is (%d, %d, %d), "
 			  "which is invalid.  The partition table's CHS "
 			  "geometry is (%d, %d, %d).  If you select Ignore, "
-			  "the file system's CHS geometry will be left "
-			  "unchanged.  If you select Fix, the file system's "
+			  "the filesystem's CHS geometry will be left "
+			  "unchanged.  If you select Fix, the filesystem's "
 			  "CHS geometry will be set to match the partition "
 			  "table's CHS geometry."),
 			 cyl_count, fs_info->heads, fs_info->sectors_per_track,
diff -ur cvs-parted/libparted/fs_fat/fat.c parted-new/libparted/fs_fat/fat.c
--- cvs-parted/libparted/fs_fat/fat.c	2004-08-16 00:45:28.000000000 +0200
+++ parted-new/libparted/fs_fat/fat.c	2005-03-22 18:39:23.989969080 +0100
@@ -309,7 +309,7 @@
 			&fs_info->fat_sectors)) {
 		ped_exception_throw (PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-			_("Partition too big/small for a %s file system"),
+			_("Partition too big/small for a %s file system."),
 			(fat_type == FAT_TYPE_FAT16)
 		       		? fat16_type.name
 				: fat32_type.name);
@@ -476,9 +476,9 @@
 			if (ped_exception_throw (PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_IGNORE_CANCEL,
 				_("The FATs don't match.  If you don't know "
-				"what this means, then select cancel, run "
-				"scandisk on the file system, and then come "
-				"back."))
+				  "what this means, then select cancel, run "
+				  "scandisk on the filesystem, and then come "
+				  "back."))
 			    != PED_EXCEPTION_IGNORE)
 				goto error_free_table_copy;
 		}
@@ -527,11 +527,11 @@
 		    || fat_sectors != fs_info->fat_sectors) {
 			if (ped_exception_throw (PED_EXCEPTION_WARNING,
 				PED_EXCEPTION_IGNORE_CANCEL,
-				_("File system doesn't have expected sizes for "
-				"Windows to like it.  "
-				"Cluster size is %dk (%dk expected); "
-				"number of clusters is %d (%d expected); "
-				"size of FATs is %d sectors (%d expected)."),
+				_("Filesystem doesn't have the expected sizes "
+				  "for Windows to like it.  "
+				  "Cluster size is %dk (%dk expected); "
+				  "number of clusters is %d (%d expected); "
+				  "size of FATs is %d sectors (%d expected)."),
 				(int) fs_info->cluster_sectors / 2,
 					(int) cluster_sectors / 2,
 				(int) fs_info->cluster_count,
@@ -549,8 +549,8 @@
 		if (info_free_clusters != fs_info->fat->free_cluster_count) {
 			if (ped_exception_throw (PED_EXCEPTION_WARNING,
 				PED_EXCEPTION_IGNORE_CANCEL,
-				_("File system is reporting the free space as "
-				"%d clusters, not %d clusters."),
+				_("Filesystem is reporting the free space as "
+				  "%d clusters, not %d clusters."),
 				info_free_clusters,
 				fs_info->fat->free_cluster_count)
 					!= PED_EXCEPTION_IGNORE)
@@ -870,7 +870,7 @@
 {
 	if (sizeof (FatBootSector) != 512) {
 		ped_exception_throw (PED_EXCEPTION_BUG, PED_EXCEPTION_CANCEL,
-			_("GNU parted was miscompiled: the FAT boot sector "
+			_("GNU Parted was miscompiled: the FAT boot sector "
 			"should be 512 bytes.  FAT support will be disabled."));
 	} else {
 		ped_file_system_type_register (&fat16_type);
diff -ur cvs-parted/libparted/fs_fat/resize.c parted-new/libparted/fs_fat/resize.c
--- cvs-parted/libparted/fs_fat/resize.c	2004-11-18 22:26:16.000000000 +0100
+++ parted-new/libparted/fs_fat/resize.c	2005-03-22 18:39:23.990968928 +0100
@@ -156,7 +156,7 @@
 			return ped_exception_throw (PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_IGNORE_CANCEL,
 				_("There's not enough room in the root "
-				  "directory, for all of the files.  Either "
+				  "directory for all of the files.  Either "
 				  "cancel, or ignore to lose the files."))
 					== PED_EXCEPTION_IGNORE;
 		}
@@ -481,7 +481,7 @@
 	char*			fat32_msg;
 
 	if (fs_info->fat_type == FAT_TYPE_FAT16)
-		fat16_msg = _("If leave your file system as FAT16, "
+		fat16_msg = _("If you leave your filesystem as FAT16, "
 			      "then you will have no problems.");
 	else
 		fat16_msg = _("If you convert to FAT16, and MS Windows "
@@ -492,7 +492,7 @@
 			      "your distribution's manual).");
 
 	if (fs_info->fat_type == FAT_TYPE_FAT32)
-		fat32_msg = _("If you leave your file system as FAT32, "
+		fat32_msg = _("If you leave your filesystem as FAT32, "
 			      "then you will not introduce any new "
 			      "problems.");
 	else
@@ -502,9 +502,9 @@
 			      "loader.  If you want to do this, you "
 			      "should consult the Parted manual (or "
 			      "your distribution's manual).  Also, "
-			      "converting to FAT32 will make the file "
-			      "system unreadable by MS DOS, MS Windows "
-			      "95a, and MS Windows NT.");
+			      "converting to FAT32 will make the "
+			      "filesystem unreadable by MS DOS, MS "
+			      "Windows 95a, and MS Windows NT.");
 
 	if (fat16_ok && fat32_ok) {
 		status = ped_exception_throw (
@@ -539,7 +539,7 @@
 				PED_EXCEPTION_WARNING,
 				PED_EXCEPTION_OK_CANCEL,
 				_("%s  %s"),
-				_("The file system can only be resized to this "
+				_("The filesystem can only be resized to this "
 				  "size by converting to FAT16."),
 				fat16_msg);
 			if (status == PED_EXCEPTION_CANCEL)
@@ -555,7 +555,7 @@
 				PED_EXCEPTION_WARNING,
 				PED_EXCEPTION_OK_CANCEL,
 				_("%s  %s"),
-				_("The file system can only be resized to this "
+				_("The filesystem can only be resized to this "
 				  "size by converting to FAT32."),
 				fat32_msg);
 			if (status == PED_EXCEPTION_CANCEL)
@@ -568,8 +568,8 @@
 	ped_exception_throw (
 		PED_EXCEPTION_NO_FEATURE,
 		PED_EXCEPTION_CANCEL,
-		_("GNU Parted can not resize this partition to this size.  "
-		"We're working on it!"));
+		_("GNU Parted cannot resize this partition to this size.  "
+		  "We're working on it!"));
 
 	return 0;
 }
diff -ur cvs-parted/libparted/fs_hfs/cache.c parted-new/libparted/fs_hfs/cache.c
--- cvs-parted/libparted/fs_hfs/cache.c	2005-02-02 15:38:07.000000000 +0100
+++ parted-new/libparted/fs_hfs/cache.c	2005-03-22 18:39:23.991968776 +0100
@@ -135,9 +135,9 @@
 	if (ext) {
 		ped_exception_throw (PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
-		      _("Trying to register an extent starting at block 0x%X, "\
-		        "but an other one already exists at this position. "\
-			"You should check the filesystem !"), start);
+		      _("Trying to register an extent starting at block 0x%X, "
+		        "but another one already exists at this position.  "
+			"You should check the filesystem!"), start);
 		return NULL;
 	}
 
@@ -210,9 +210,9 @@
 	if (pext) {
 		ped_exception_throw (PED_EXCEPTION_BUG,
 		     PED_EXCEPTION_CANCEL,
-		   _("Trying to move an extent from block Ox%X to block Ox%X, "\
-		     "but an other one already exists at this position. "\
-		     "This should not happen !"), old_start, new_start);
+		   _("Trying to move an extent from block Ox%X to block Ox%X, "
+		     "but another one already exists at this position.  "
+		     "This should not happen!"), old_start, new_start);
 		return NULL;
 	}
 
diff -ur cvs-parted/libparted/fs_hfs/file.c parted-new/libparted/fs_hfs/file.c
--- cvs-parted/libparted/fs_hfs/file.c	2005-02-02 15:38:07.000000000 +0100
+++ parted-new/libparted/fs_hfs/file.c	2005-03-22 18:39:23.991968776 +0100
@@ -143,8 +143,8 @@
 					&(file->start_cache))) {
 		ped_exception_throw (PED_EXCEPTION_WARNING,
 		      PED_EXCEPTION_CANCEL,
-		      _("Could not update the extent cache for %s "\
-		      "file with CNID %X."),
+		      _("Could not update the extent cache for %s "
+			"file with CNID %X."),
 		      "HFS", PED_BE32_TO_CPU(file->CNID));
 		return 0;
 	}
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-02-02 15:38:07.000000000 +0100
+++ parted-new/libparted/fs_hfs/file_plus.c	2005-03-22 18:39:23.991968776 +0100
@@ -157,8 +157,8 @@
 					    &(file->start_cache))) {
 		ped_exception_throw (PED_EXCEPTION_WARNING,
 		      PED_EXCEPTION_CANCEL,
-		      _("Could not update the extent cache for %s "\
-		      "file with CNID %X."),
+		      _("Could not update the extent cache for %s "
+		        "file with CNID %X."),
 		      "HFS+", PED_BE32_TO_CPU(file->CNID));
 		return ret; /* ret == {0,0} */
 	}
@@ -210,8 +210,8 @@
 		if (phy_area.sector_count == 0) {
 			ped_exception_throw (PED_EXCEPTION_ERROR,
 			      PED_EXCEPTION_CANCEL,
-			      _("Could not find sector %lli of %s file with "\
-			      "CNID %X."), sector, "HFS+", 
+			      _("Could not find sector %lli of %s file with "
+			        "CNID %X."), sector, "HFS+", 
 			      PED_BE32_TO_CPU(file->CNID));
 			return 0;
 		}
@@ -250,8 +250,8 @@
 		if (phy_area.sector_count == 0) {
 			ped_exception_throw (PED_EXCEPTION_ERROR,
 			      PED_EXCEPTION_CANCEL,
-			      _("Could not find sector %lli of %s file with "\
-			      "CNID %X."), sector, "HFS+", 
+			      _("Could not find sector %lli of %s file with "
+			        "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-14 17:02:12.000000000 +0100
+++ parted-new/libparted/fs_hfs/hfs.c	2005-03-22 18:39:23.994968320 +0100
@@ -258,8 +258,8 @@
 			resize = 0;
 			ped_exception_throw (PED_EXCEPTION_ERROR,
 			      PED_EXCEPTION_CANCEL,
-			      _("Data relocation left some data in the end of"\
-			      " the volume."));
+			      _("Data relocation left some data at the end of "
+			      "the volume."));
 			goto write_MDB;
 		}
 	}
@@ -446,8 +446,8 @@
 	if (vh->attributes & PED_CPU_TO_BE32(1<<HFSP_JOURNALED)) {
 		if (ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
 		      PED_EXCEPTION_IGNORE_CANCEL,
-		      _("Journaled HFS+ volumes aren't supported, "\
-		        "you should desactivate the journal "\
+		      _("Journaled HFS+ volumes aren't supported, "
+		        "you should deactivate the journal "
 			"before trying any operation on them."))
 		    != PED_EXCEPTION_IGNORE)
 			goto hpo_pg;
@@ -484,11 +484,11 @@
 	if (priv_data->attributes_file->sect_nb != 0) {
 		if (ped_exception_throw (PED_EXCEPTION_WARNING,
 		      PED_EXCEPTION_IGNORE_CANCEL,
-		      _("You have an HFS+ file system that has a feature that "\
-		      "I haven't seen used anywhere. Parted can theoretically "\
-		      "handle it, but the corresponding code has never been "\
-		      "tested, so this might be risky. Please email me so I "\
-		      "can see how it works! <address@hidden>"))
+		      _("You have an HFS+ filesystem that has a feature that I "
+		        "haven't seen used anywhere.  Parted can theoretically "
+		        "handle it, but the corresponding code has never been "
+		        "tested, so this might be risky.  Please email me so I "
+		        "can see how it works!  <address@hidden>"))
 		    != PED_EXCEPTION_IGNORE)
 			goto hpo_cl;
 	}
@@ -636,8 +636,8 @@
 			resize = 0;
 			ped_exception_throw (PED_EXCEPTION_ERROR,
 			      PED_EXCEPTION_CANCEL,
-			      _("Data relocation left some data in the end of"\
-			      " the volume."));
+			      _("Data relocation left some data at the end of "
+				"the volume."));
 			goto write_VH;
 		}
 	}
@@ -703,8 +703,8 @@
 							block)) {
 				ped_exception_throw (PED_EXCEPTION_WARNING,
 				      PED_EXCEPTION_IGNORE,
-				      _("Error while writing the compatibility "\
-				      "part of the allocation file."));
+				      _("Error while writing the compatibility "
+				        "part of the allocation file."));
 				break;
 			}
 		}
@@ -817,8 +817,8 @@
 			       (HfsPrivateGenericKey*) &key, NULL, 0, &ref)) {
 		ped_exception_throw (PED_EXCEPTION_ERROR,
 		      PED_EXCEPTION_CANCEL,
-		      _("An error occured while looking for the mandatory "\
-		        "bad blocs file."));
+		      _("An error occured while looking for the mandatory "
+		        "bad blocks file."));
 		return 0;
 	}
 	if (!hfs_file_read_sector (hfs_priv_data->extent_file, node,
@@ -868,8 +868,8 @@
 	/* not found : not a valid hfs+ wrapper : failure */
 	ped_exception_throw (PED_EXCEPTION_ERROR,
 	      PED_EXCEPTION_CANCEL,
-	      _("It seems there is an error in the HFS wrapper : "\
-	      "the bad blocs file doesn't contain the embedded HFS+ volume."));
+	      _("It seems there is an error in the HFS wrapper: the "
+	        "bad blocks file doesn't contain the embedded HFS+ volume."));
 	return 0;
 }
 
@@ -1035,8 +1035,8 @@
 						fs->type_specific;
 
 	ped_exception_throw (PED_EXCEPTION_INFORMATION, PED_EXCEPTION_OK,
-		_("This is not a real %s check. This is going to extract "\
-		   "special low level files for debugging purposes."), "HFS");
+		_("This is not a real %s check.  This is going to extract "
+		  "special low level files for debugging purposes."), "HFS");
 
 	extract_buffer = ped_malloc(MAX_BUFF * PED_SECTOR_SIZE);
 	if (!extract_buffer) return 0;
@@ -1089,7 +1089,7 @@
 	}
 
 	ped_exception_throw (PED_EXCEPTION_INFORMATION, PED_EXCEPTION_OK,
-		_("This is not a real %s check. This is going to extract "\
+		_("This is not a real %s check.  This is going to extract "
 		  "special low level files for debugging purposes."), "HFS+");
 
 	extract_buffer = ped_malloc(MAX_BUFF * PED_SECTOR_SIZE);
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-14 17:02:12.000000000 +0100
+++ parted-new/libparted/fs_hfs/reloc.c	2005-03-22 18:39:23.995968168 +0100
@@ -260,8 +260,8 @@
 		    default :
 			ped_exception_throw (PED_EXCEPTION_ERROR,
 			    PED_EXCEPTION_CANCEL,
-			  _("A reference to an extent comes from a place it "\
-			    "should not. You should check the filesystem !"));
+			  _("A reference to an extent comes from a place it "
+			    "should not.  You should check the filesystem!"));
 			return -1;
 			break;
 		}
@@ -367,8 +367,8 @@
 	if (!priv_data->catalog_file->sect_nb) {
 		ped_exception_throw (PED_EXCEPTION_INFORMATION,
 				     PED_EXCEPTION_OK,
-				   _("This HFS volume has no catalog file. "\
-				     "This is very unusual !"));
+				   _("This HFS volume has no catalog file.  "
+				     "This is very unusual!"));
 		return 1;
 	}
 
@@ -459,8 +459,8 @@
 	if (!priv_data->extent_file->sect_nb) {
 		ped_exception_throw (PED_EXCEPTION_INFORMATION,
 				     PED_EXCEPTION_OK,
-				   _("This HFS volume has no extents overflow"\
-				     " file. This is quite unusual !"));
+				   _("This HFS volume has no extents overflow "
+				     "file.  This is quite unusual!"));
 		return 1;
 	}
 
@@ -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 "\
-				      "contains extents of itself... You "\
+				    _("The extents overflow file should not "
+				      "contains extents of itself...  You "
 				      "should better check the filesystem."))
 				    != PED_EXCEPTION_IGNORE)
 					return 0;
@@ -609,8 +609,8 @@
 			else if (ret == -1) {
 				ped_exception_throw (PED_EXCEPTION_ERROR,
 				      PED_EXCEPTION_CANCEL,
-				      _("An error occured during extent "\
-				      "relocation."));
+				      _("An error occured during extent "
+				        "relocation."));
 				hfsc_delete_cache(cache);
 				ped_free(hfs_block); hfs_block = NULL;
 				return 0;
diff -ur cvs-parted/libparted/fs_hfs/reloc_plus.c parted-new/libparted/fs_hfs/reloc_plus.c
--- cvs-parted/libparted/fs_hfs/reloc_plus.c	2005-03-14 17:02:12.000000000 +0100
+++ parted-new/libparted/fs_hfs/reloc_plus.c	2005-03-22 18:39:23.996968016 +0100
@@ -280,8 +280,8 @@
 		    default :
 			ped_exception_throw (PED_EXCEPTION_ERROR,
 			    PED_EXCEPTION_CANCEL,
-			  _("A reference to an extent comes from a place it "\
-			    "should not. You should check the filesystem !"));
+			  _("A reference to an extent comes from a place it "
+			    "should not.  You should check the filesystem!"));
 			return -1;
 			break;
 		}
@@ -434,8 +434,8 @@
 	if (!priv_data->catalog_file->sect_nb) {
 		ped_exception_throw (PED_EXCEPTION_INFORMATION,
 				     PED_EXCEPTION_OK,
-				   _("This HFS+ volume has no catalog file. "\
-				     "This is very unusual !"));
+				   _("This HFS+ volume has no catalog file.  "
+				     "This is very unusual!"));
 		return 1;
 	}
 
@@ -543,8 +543,8 @@
 	if (!priv_data->extents_file->sect_nb) {
 		ped_exception_throw (PED_EXCEPTION_INFORMATION,
 				     PED_EXCEPTION_OK,
-				   _("This HFS+ volume has no extents overflow"\
-				     " file. This is quite unusual !"));
+				   _("This HFS+ volume has no extents overflow "
+				     "file.  This is quite unusual!"));
 		return 1;
 	}
 
@@ -590,8 +590,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 "\
-				      "contains extents of itself... You "\
+				    _("The extents overflow file should not "
+				      "contains extents of itself...  You "
 				      "should better check the filesystem."))
 				    != PED_EXCEPTION_IGNORE)
 					return 0;
@@ -824,8 +824,8 @@
 			else if (ret == -1) {
 				ped_exception_throw (PED_EXCEPTION_ERROR,
 				      PED_EXCEPTION_CANCEL,
-				      _("An error occured during extent "\
-				      "relocation."));
+				      _("An error occured during extent "
+				        "relocation."));
 				ped_free(hfsp_block); hfsp_block = NULL;
 				hfsc_delete_cache(cache);
 				return 0;
diff -ur cvs-parted/libparted/fs_reiserfs/reiserfs.c parted-new/libparted/fs_reiserfs/reiserfs.c
--- cvs-parted/libparted/fs_reiserfs/reiserfs.c	2004-11-21 22:03:23.000000000 +0100
+++ parted-new/libparted/fs_reiserfs/reiserfs.c	2005-03-22 18:39:23.997967864 +0100
@@ -395,22 +395,22 @@
 	if (!reiserfs_fs_is_consistent(fs_info)) {
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 				    PED_EXCEPTION_CANCEL,
-				    _
-				    ("Filesystem isn't in valid state. Possible it is mounted."));
+				    _("Filesystem is not in a valid state.  "
+				      "Maybe it is mounted."));
 		return 0;
 	}
 
 	if (!reiserfs_fs_is_resizeable(fs_info))
 		ped_exception_throw(PED_EXCEPTION_WARNING,
 				    PED_EXCEPTION_IGNORE,
-				    _
-				    ("Filesystem is in old (not resizeable format)"));
+				    _("Filesystem is in an old (unresizeable) "
+				      "format."));
 
 	if (!reiserfs_fs_bitmap_check(fs_info)) {
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 				    PED_EXCEPTION_CANCEL,
-				    _
-				    ("Invalid free blocks count. Run reiserfsck --check first."));
+				    _("Invalid free blocks count.  Run "
+				      "'reiserfsck --check' first."));
 		return 0;
 	}
 
@@ -430,9 +430,8 @@
 	if (!reiserfs_fs_check(fs_info, gauge)) {
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 				    PED_EXCEPTION_CANCEL,
-				    _
-				    ("Reiserfs tree seems to be corrupted. "
-				     "Run reiserfsck --check first."));
+				    _("Reiserfs tree seems to be corrupted.  "
+				      "Run 'reiserfsck --check' first."));
 		return 0;
 	}
 	
@@ -443,9 +442,9 @@
 #endif
 	
 	ped_exception_throw(PED_EXCEPTION_INFORMATION, PED_EXCEPTION_OK,
-			    _
-			    ("The reiserfs filesystem passed a basic check.  For a more "
-			     "comprehensive check, use the reiserfsck --check"));
+			    _("The reiserfs filesystem passed a basic check.  "
+			      "For a more comprehensive check, use "
+			      "'reiserfsck --check'."));
 
 	return 1;
 }
@@ -466,16 +465,16 @@
 	if (fs->geom->dev != geom->dev) {
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 				    PED_EXCEPTION_CANCEL,
-				    _
-				    ("Filesystem device isn't equals geometry device."));
+				    _("Filesystem device doesn't equal "
+				      "geometry device."));
 		return 0;
 	}
 
 	if (fs->geom->start != geom->start) {
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 				    PED_EXCEPTION_CANCEL,
-				    _
-				    ("Sorry, can't move the start of reiserfs partitions yet."));
+				    _("Sorry, can't move the start of "
+				      "reiserfs partitions yet."));
 		return 0;
 	}
 
@@ -490,8 +489,9 @@
 		if (!geom_dal_reopen(dal, O_RDWR)) {
 			ped_exception_throw(PED_EXCEPTION_ERROR,
 					    PED_EXCEPTION_CANCEL,
-					    _
-					    ("Couldn't reopen device abstraction layer for read/write."));
+					    _("Couldn't reopen device "
+					      "abstraction layer for "
+					      "read/write."));
 			return 0;
 		}
 	}
@@ -592,8 +592,8 @@
 	if (!(dal = geom_dal_create(fs_geom, DEFAULT_BLOCK_SIZE, O_RDWR))) {
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 				    PED_EXCEPTION_CANCEL,
-				    _
-				    ("Couldn't create reiserfs device abstraction handler"));
+				    _("Couldn't create reiserfs device "
+				      "abstraction handler."));
 		goto error_free_fs_geom;
 	}
 
@@ -606,8 +606,7 @@
 	if (fs_len <= min_needed_blk) {
 		ped_exception_throw(PED_EXCEPTION_ERROR,
 				    PED_EXCEPTION_CANCEL,
-				    _
-				    ("Device is too small for %lu blocks"),
+				    _("Device is too small for %lu blocks."),
 				    min_needed_blk);
 		goto error_free_dal;
 	}
@@ -684,7 +683,7 @@
 	if ((error = dlerror()) != NULL) {
 		ped_exception_throw(PED_EXCEPTION_WARNING,
 				    PED_EXCEPTION_IGNORE,
-				    _("Couldn't resolve symbol %s. Error: %s."),
+				    _("Couldn't resolve symbol %s.  Error: %s."),
 				    symbol, error);
 		return NULL;
 	}
@@ -716,8 +715,8 @@
 	    REISERFS_API_VERSION > max_interface_version) {
 		ped_exception_throw(
 			PED_EXCEPTION_WARNING, PED_EXCEPTION_CANCEL,
-			_("GNU Parted has detected libreiserfs interface "
-			  "version mismatch. Found %d-%d, required %d. "
+			_("GNU Parted detected a libreiserfs interface "
+			  "version mismatch.  Found %d-%d, required %d.  "
 			  "ReiserFS support will be disabled."),
 			min_interface_version,
 			max_interface_version,
diff -ur cvs-parted/libparted/geom.c parted-new/libparted/geom.c
--- cvs-parted/libparted/geom.c	2005-03-14 17:02:12.000000000 +0100
+++ parted-new/libparted/geom.c	2005-03-22 18:39:23.997967864 +0100
@@ -196,7 +196,7 @@
 		exception_status = ped_exception_throw (
 			PED_EXCEPTION_ERROR, PED_EXCEPTION_IGNORE_CANCEL,
 			_("Attempt to read sectors %ld-%ld outside of "
-			  "partition on %s"),
+			  "partition on %s."),
 			(long) start, (long) (start + count - 1),
 			geom->dev->path);
 		return exception_status == PED_EXCEPTION_IGNORE;
@@ -240,7 +240,7 @@
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_IGNORE_CANCEL,
 			_("Attempt to write sectors %ld-%ld outside of "
-			  "partition on %s"),
+			  "partition on %s."),
 			(long) start, (long) (start + count - 1),
 			geom->dev->path);
 		return exception_status == PED_EXCEPTION_IGNORE;
diff -ur cvs-parted/libparted/gnu.c parted-new/libparted/gnu.c
--- cvs-parted/libparted/gnu.c	2005-03-14 17:02:12.000000000 +0100
+++ parted-new/libparted/gnu.c	2005-03-22 18:39:23.998967712 +0100
@@ -352,11 +352,11 @@
 		ped_exception_throw (
 			PED_EXCEPTION_WARNING,
 			PED_EXCEPTION_OK,
-			_("The partition table was unable to be reread, "
-			  "as such, you need to reboot before mounting any "
-			  "modified partitions.  You also need to reinstall "
-			  "your boot loader before you reboot (which may "
-			  "require mounting modified partitions).  It is "
+			_("The partition table cannot be re-read.  This means "
+			  "you need to reboot before mounting any modified "
+			  "partitions.  But you also need to reinstall your "
+			  "boot loader before you reboot, and that may "
+			  "require mounting modified partitions.  It is "
 			  "impossible do both things!  So you'll need to "
 			  "boot off a rescue disk, and reinstall your boot "
 			  "loader from the rescue disk.  Read section 4 of "
@@ -369,10 +369,10 @@
 		ped_exception_throw (
 			PED_EXCEPTION_WARNING,
 			PED_EXCEPTION_IGNORE,
-			_("The partition table on %s (%s).  This means "
-			  "the Hurd knows nothing about any modifications "
-			  "you made.  You should reboot your computer "
-			  "before doing anything with %s."),
+			_("The partition table on %s (%s) cannot be re-read.  "
+			  "This means the Hurd knows nothing about any "
+			  "modifications you made.  You should reboot your "
+			  "computer before doing anything with %s."),
 			dev->path, strerror (errno), dev->path);
 	}
 
diff -ur cvs-parted/libparted/linux.c parted-new/libparted/linux.c
--- cvs-parted/libparted/linux.c	2005-03-14 19:53:23.000000000 +0100
+++ parted-new/libparted/linux.c	2005-03-22 18:52:19.025145824 +0100
@@ -369,7 +369,7 @@
 			PED_EXCEPTION_IGNORE_CANCEL,
 			_("The sector size on %s is %d bytes.  Parted is known "
 			"not to work properly with drives with sector sizes "
-			"other than %d bytes"),
+			"other than %d bytes."),
 			dev->path,
 			sector_size,
 			PED_SECTOR_SIZE)
@@ -413,7 +413,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_BUG,
 			PED_EXCEPTION_CANCEL,
-			_("Unable to determine the size of %s (%s)"),
+			_("Unable to determine the size of %s (%s)."),
 			dev->path,
 			strerror (errno));
 		return 0;
@@ -673,7 +673,7 @@
 			PED_EXCEPTION_ERROR,
 			PED_EXCEPTION_CANCEL,
 			_("The device %s is zero-length, and can't possibly "
-			  "store a file system or partition table.  Perhaps "
+			  "store a filesystem or partition table.  Perhaps "
 			  "you selected the wrong device?"),
 			dev->path);
 		goto error_close_dev;
@@ -823,7 +823,7 @@
 	default:
 		ped_exception_throw (PED_EXCEPTION_NO_FEATURE,
 				PED_EXCEPTION_CANCEL,
-				_("ped_device_new()  Unsupported device type"));
+				_("Internal error: unsupported device type.));
 		goto error_free_arch_specific;
 	}
 	return dev;
@@ -1612,7 +1612,7 @@
 			_("Error informing the kernel about modifications to "
 			  "partition %s - %s.  This means Linux won't know "
 			  "about any changes you made to %s until you reboot "
-			  "- so you shouldn't mount it or use it in any way "
+			  "-- so you should not mount nor use it in any way "
 			  "before rebooting."),
 			linux_part.devname,
 			strerror (errno),
@@ -1691,8 +1691,8 @@
 				PED_EXCEPTION_IGNORE,
 			_("The kernel was unable to re-read the partition "
 			  "table on %s (%s).  This means Linux won't know "
-			  "anything nothing about the modifications you made "
-			  "until you reboot.  You should reboot your computer "
+			  "anything about the modifications you made until"
+			  "you reboot.  You should reboot your computer "
 			  "before doing anything with %s."),
 				dev->path, strerror (errno), dev->path);
 			return 0;