diff -ur cvs-parted/libparted/disk_dos.c parted-fresh/libparted/disk_dos.c
--- cvs-parted/libparted/disk_dos.c	2005-03-27 15:11:18.000000000 +0200
+++ parted-fresh/libparted/disk_dos.c	2005-03-27 16:46:00.000000000 +0200
@@ -779,7 +779,7 @@
 		if (ped_exception_throw (
 			PED_EXCEPTION_ERROR, PED_EXCEPTION_IGNORE_CANCEL,
 			_("Invalid partition table on %s "
-			  "- wrong signature %x."),
+			  "-- wrong signature %x."),
 			disk->dev->path,
 			PED_LE16_TO_CPU (table.magic))
 				!= PED_EXCEPTION_IGNORE)
@@ -1261,7 +1261,7 @@
 			ped_exception_throw (
 				PED_EXCEPTION_ERROR,
 				PED_EXCEPTION_CANCEL,
-				_("Extended partitions can not be hidden on "
+				_("Extended partitions cannot be hidden on "
 				  "msdos disk labels."));
 			return 0;
 		}
diff -ur cvs-parted/libparted/disk_pc98.c parted-fresh/libparted/disk_pc98.c
--- cvs-parted/libparted/disk_pc98.c	2005-03-27 15:11:19.000000000 +0200
+++ parted-fresh/libparted/disk_pc98.c	2005-03-27 16:34:47.000000000 +0200
@@ -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.  This is 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.  This is still unsupported."),
 		    part->num);
 		return 0;
 	}
diff -ur cvs-parted/libparted/fs_ext2/ext2_resize.c parted-fresh/libparted/fs_ext2/ext2_resize.c
--- cvs-parted/libparted/fs_ext2/ext2_resize.c	2005-03-27 15:11:42.000000000 +0200
+++ parted-fresh/libparted/fs_ext2/ext2_resize.c	2005-03-27 16:34:47.000000000 +0200
@@ -526,7 +526,7 @@
 	    - 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 "
+			_("Your filesystem is too full to resize it to %i "
 			  "blocks.  Sorry."), newsize);
 		return 0;
 	}
@@ -536,7 +536,7 @@
 	    		> 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 "
+			_("Your filesystem has too many occupied inodes to "
 			  "resize it to %i blocks.  Sorry."), newsize);
 		return 0;
 	}
diff -ur cvs-parted/libparted/fs_fat/bootsector.c parted-fresh/libparted/fs_fat/bootsector.c
--- cvs-parted/libparted/fs_fat/bootsector.c	2005-03-27 15:11:42.000000000 +0200
+++ parted-fresh/libparted/fs_fat/bootsector.c	2005-03-27 16:36:55.000000000 +0200
@@ -80,7 +80,7 @@
 
 	if (bs->fats < 1 || bs->fats > 4) {
 		ped_exception_throw (PED_EXCEPTION_ERROR, PED_EXCEPTION_CANCEL,
-			_("File system has an invalid number of FATS."));
+			_("File system 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;
diff -ur cvs-parted/libparted/fs_fat/clstdup.c parted-fresh/libparted/fs_fat/clstdup.c
--- cvs-parted/libparted/fs_fat/clstdup.c	2004-06-13 08:35:11.000000000 +0200
+++ parted-fresh/libparted/fs_fat/clstdup.c	2005-03-27 16:43:57.000000000 +0200
@@ -80,7 +80,7 @@
 	ped_exception_catch ();
 
 /* something bad happened, so read fragments one by one.  (The error may
-   have occured on an unused fragment: who cares) */
+   have occurred on an unused fragment: who cares) */
 	for (i = 0; i < length; i++) {
 		if (ctx->buffer_map [i]) {
 			if (!fat_read_fragment (ctx->old_fs,
diff -ur cvs-parted/libparted/fs_fat/fat.c parted-fresh/libparted/fs_fat/fat.c
--- cvs-parted/libparted/fs_fat/fat.c	2005-03-27 15:11:42.000000000 +0200
+++ parted-fresh/libparted/fs_fat/fat.c	2005-03-27 16:49:31.000000000 +0200
@@ -435,7 +435,7 @@
 	return 1;
 }
 
-/* Hack: just resize the filesystem outside of it's boundaries! */
+/* Hack: just resize the filesystem outside of its boundaries! */
 PedFileSystem*
 fat_copy (const PedFileSystem* fs, PedGeometry* geom, PedTimer* timer)
 {
@@ -550,7 +550,7 @@
 			if (ped_exception_throw (PED_EXCEPTION_WARNING,
 				PED_EXCEPTION_IGNORE_CANCEL,
 				_("File system is reporting the free space as "
-				"%d clusters, not %d clusters."),
+				  "%d clusters, not %d clusters."),
 				info_free_clusters,
 				fs_info->fat->free_cluster_count)
 					!= PED_EXCEPTION_IGNORE)
diff -ur cvs-parted/libparted/fs_fat/resize.c parted-fresh/libparted/fs_fat/resize.c
--- cvs-parted/libparted/fs_fat/resize.c	2005-03-27 15:11:42.000000000 +0200
+++ parted-fresh/libparted/fs_fat/resize.c	2005-03-27 16:34:47.000000000 +0200
@@ -569,7 +569,7 @@
 		PED_EXCEPTION_NO_FEATURE,
 		PED_EXCEPTION_CANCEL,
 		_("GNU Parted cannot resize this partition to this size.  "
-		"We're working on it!"));
+		  "We're working on it!"));
 
 	return 0;
 }
diff -ur cvs-parted/libparted/fs_hfs/cache.c parted-fresh/libparted/fs_hfs/cache.c
--- cvs-parted/libparted/fs_hfs/cache.c	2005-03-27 15:11:42.000000000 +0200
+++ parted-fresh/libparted/fs_hfs/cache.c	2005-03-27 16:34:47.000000000 +0200
@@ -136,7 +136,7 @@
 		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.  "
+		        "but another one already exists at this position.  "
 			"You should check the file system!"), start);
 		return NULL;
 	}
@@ -211,7 +211,7 @@
 		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.  "
+		     "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-fresh/libparted/fs_hfs/file.c
--- cvs-parted/libparted/fs_hfs/file.c	2005-03-27 15:11:43.000000000 +0200
+++ parted-fresh/libparted/fs_hfs/file.c	2005-03-27 16:50:27.000000000 +0200
@@ -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-fresh/libparted/fs_hfs/file_plus.c
--- cvs-parted/libparted/fs_hfs/file_plus.c	2005-03-27 15:11:43.000000000 +0200
+++ parted-fresh/libparted/fs_hfs/file_plus.c	2005-03-27 17:01:55.000000000 +0200
@@ -211,8 +211,8 @@
 			ped_exception_throw (PED_EXCEPTION_ERROR,
 			      PED_EXCEPTION_CANCEL,
 			      _("Could not find sector %lli of %s file with "
-			      "CNID %X."), sector, "HFS+", 
-			      PED_BE32_TO_CPU(file->CNID));
+			        "CNID %X."), 
+			      sector, "HFS+", PED_BE32_TO_CPU(file->CNID));
 			return 0;
 		}
 		if (!ped_geometry_read(priv_data->plus_geom, buf,
diff -ur cvs-parted/libparted/fs_hfs/hfs.c parted-fresh/libparted/fs_hfs/hfs.c
--- cvs-parted/libparted/fs_hfs/hfs.c	2005-03-27 15:11:43.000000000 +0200
+++ parted-fresh/libparted/fs_hfs/hfs.c	2005-03-27 16:44:37.000000000 +0200
@@ -637,8 +637,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;
 		}
 	}
@@ -819,8 +819,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 occurred while looking for the mandatory "
+		        "bad blocks file."));
 		return 0;
 	}
 	if (!hfs_file_read_sector (hfs_priv_data->extent_file, node,
diff -ur cvs-parted/libparted/fs_hfs/reloc.c parted-fresh/libparted/fs_hfs/reloc.c
--- cvs-parted/libparted/fs_hfs/reloc.c	2005-03-27 15:11:43.000000000 +0200
+++ parted-fresh/libparted/fs_hfs/reloc.c	2005-03-27 16:44:21.000000000 +0200
@@ -170,7 +170,7 @@
 }
 
 /* Update MDB */
-/* Return 0 if an error occured */
+/* Return 0 if an error occurred */
 /* Return 1 if everything ok */
 int
 hfs_update_mdb (PedFileSystem *fs)
@@ -278,7 +278,7 @@
 /* This function moves an extent starting at block fblock to block to_fblock
    if there's enough room */
 /* Return 1 if everything was fine */
-/* Return -1 if an error occured */
+/* Return -1 if an error occurred */
 /* Return 0 if no extent was found */
 /* Generic search thanks to the filesystem cache */
 static int
@@ -609,7 +609,7 @@
 			else if (ret == -1) {
 				ped_exception_throw (PED_EXCEPTION_ERROR,
 				      PED_EXCEPTION_CANCEL,
-				      _("An error occured during extent "
+				      _("An error occurred during extent "
 				        "relocation."));
 				hfsc_delete_cache(cache);
 				ped_free(hfs_block); hfs_block = NULL;
diff -ur cvs-parted/libparted/fs_hfs/reloc_plus.c parted-fresh/libparted/fs_hfs/reloc_plus.c
--- cvs-parted/libparted/fs_hfs/reloc_plus.c	2005-03-27 15:11:43.000000000 +0200
+++ parted-fresh/libparted/fs_hfs/reloc_plus.c	2005-03-27 16:44:57.000000000 +0200
@@ -297,7 +297,7 @@
 /* This function moves an extent starting at block fblock
    to block to_fblock if there's enough room */
 /* Return 1 if everything was fine */
-/* Return -1 if an error occured */
+/* Return -1 if an error occurred */
 /* Return 0 if no extent was found */
 static int
 hfsplus_move_extent_starting_at (PedFileSystem *fs, unsigned int *ptr_fblock,
@@ -544,7 +544,7 @@
 		ped_exception_throw (PED_EXCEPTION_INFORMATION,
 				     PED_EXCEPTION_OK,
 				   _("This HFS+ volume has no extents overflow "
-				     "file. This is quite unusual!"));
+				     "file.  This is quite unusual!"));
 		return 1;
 	}
 
@@ -591,7 +591,7 @@
 				if (ped_exception_throw (PED_EXCEPTION_WARNING,
 						PED_EXCEPTION_IGNORE_CANCEL,
 				    _("The extents overflow file should not "
-				      "contain its own extents... you should "
+				      "contain its own extents...  You should "
 				      "check the file system."))
 				    != PED_EXCEPTION_IGNORE)
 					return 0;
@@ -824,7 +824,7 @@
 			else if (ret == -1) {
 				ped_exception_throw (PED_EXCEPTION_ERROR,
 				      PED_EXCEPTION_CANCEL,
-				      _("An error occured during extent "
+				      _("An error occurred during extent "
 				        "relocation."));
 				ped_free(hfsp_block); hfsp_block = NULL;
 				hfsc_delete_cache(cache);
diff -ur cvs-parted/libparted/fs_reiserfs/reiserfs.c parted-fresh/libparted/fs_reiserfs/reiserfs.c
--- cvs-parted/libparted/fs_reiserfs/reiserfs.c	2005-03-27 15:11:44.000000000 +0200
+++ parted-fresh/libparted/fs_reiserfs/reiserfs.c	2005-03-27 16:34:47.000000000 +0200
@@ -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;
 	}
 	
diff -ur cvs-parted/libparted/gnu.c parted-fresh/libparted/gnu.c
--- cvs-parted/libparted/gnu.c	2005-03-27 15:11:20.000000000 +0200
+++ parted-fresh/libparted/gnu.c	2005-03-27 16:57:18.000000000 +0200
@@ -352,8 +352,8 @@
 		ped_exception_throw (
 			PED_EXCEPTION_WARNING,
 			PED_EXCEPTION_OK,
-			_("The partition table was unable to be re-read, "
-			  "so you need to reboot before mounting any "
+			_("The partition table cannot be re-read.  This "
+			  "means 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 "
@@ -369,7 +369,7 @@
 		ped_exception_throw (
 			PED_EXCEPTION_WARNING,
 			PED_EXCEPTION_IGNORE,
-			_("The partition table on %s could not be re-read "
+			_("The partition table on %s cannot be re-read "
 			  "(%s).  This means the Hurd knows nothing about any "
 			  "modifications you made.  You should reboot your "
 			  "computer before doing anything with %s."),
diff -ur cvs-parted/libparted/libparted.c parted-fresh/libparted/libparted.c
--- cvs-parted/libparted/libparted.c	2005-03-27 15:11:20.000000000 +0200
+++ parted-fresh/libparted/libparted.c	2005-03-27 16:58:49.000000000 +0200
@@ -253,14 +253,14 @@
 			ped_exception_throw (
 				PED_EXCEPTION_INFORMATION,
 				PED_EXCEPTION_OK,
-				"Dodgey malloc(%x) == %p occured (active==%d)",
+				"Dodgy malloc(%x) == %p occurred (active==%d)",
 				size, ptr, dodgey_memory_active[i]);
 			dodgey_memory_active[i]++;
 		} else {
 			ped_exception_throw (
 				PED_EXCEPTION_INFORMATION,
 				PED_EXCEPTION_OK,
-				"Dodgey free(%p) occured (active==%d)",
+				"Dodgy free(%p) occurred (active==%d)",
 				ptr, dodgey_memory_active[i]);
 			dodgey_memory_active[i]--;
 		}