diff --git a/src/apps/drivesetup/DiskView.cpp b/src/apps/drivesetup/DiskView.cpp
index 75f90eb6ac..2d9e3a27aa 100644
--- a/src/apps/drivesetup/DiskView.cpp
+++ b/src/apps/drivesetup/DiskView.cpp
@@ -421,7 +421,7 @@ public:
 				partition_id id
 					= fSpaceIDMap.SpaceIDFor(partition->ID(), offset);
 				PartitionView* view = new PartitionView(
-					B_TRANSLATE("<empty or unknown>"), scale, offset,
+					B_TRANSLATE("Empty space"), scale, offset,
 					parentView->Level() + 1, id, partition);
 
 				fViewMap.Put(id, view);
diff --git a/src/apps/drivesetup/PartitionList.cpp b/src/apps/drivesetup/PartitionList.cpp
index afc733e7fb..2c44051832 100644
--- a/src/apps/drivesetup/PartitionList.cpp
+++ b/src/apps/drivesetup/PartitionList.cpp
@@ -305,8 +305,8 @@ PartitionListRow::PartitionListRow(BPartition* partition)
 		SetField(new BStringField(kUnavailableString), kVolumeNameColumn);
 	} else {
 		if (!partitionType.IsEmpty()) {
-			partitionType.Prepend("(");
-			partitionType.Append(")");
+			partitionType.SetToFormat(B_TRANSLATE("Not formatted (%s)"),
+				partitionType.String());
 			SetField(new BStringField(partitionType), kFilesystemColumn);
 		} else
 			SetField(new BStringField(kUnavailableString), kFilesystemColumn);
@@ -378,7 +378,7 @@ PartitionListRow::PartitionListRow(partition_id parentID, partition_id id,
 	// TODO: design icon for spaces on partitions
 	SetField(new BBitmapStringField(NULL, "-"), kDeviceColumn);
 
-	SetField(new BStringField(B_TRANSLATE("<empty or unknown>")),
+	SetField(new BStringField(B_TRANSLATE("Empty space")),
 		kFilesystemColumn);
 	SetField(new BStringField(kUnavailableString), kVolumeNameColumn);