=== modified file 'debian/ubiquity.templates'
--- debian/ubiquity.templates	2014-04-09 21:34:01 +0000
+++ debian/ubiquity.templates	2014-08-29 15:22:32 +0000
@@ -1266,9 +1266,9 @@
 Template: ubiquity/partitioner/ubuntu_format
 Type: text
 # CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-_Description: Erase ${CURDISTRO} and reinstall
- <span foreground="darkred">Warning:</span> This will delete all your
- ${CURDISTRO} programs, documents, photos, music, and any other files.
+_Description: Erase whole disk (including ${CURDISTRO}) 
+ <span foreground="darkred">Warning:</span> This will delete everything on the
+disk, including other partitions, other operating systems, all your programs, documents, photos, music, and any other files.
 
 Template: ubiquity/partitioner/ubuntu_upgrade
 Type: text
@@ -1293,19 +1293,18 @@
 Type: text
 #flag:comment:1
 # DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-_Description: Erase disk and install ${DISTRO}
- <span foreground="darkred">Warning:</span> This will delete any files on the
- disk.
+_Description: Erase whole disk and install ${DISTRO}
+ <span foreground="darkred">Warning:</span> This will delete everything on the
+disk, including other partitions, other operating systems, all your programs, documents, photos, music, and any other files.
 
 Template: ubiquity/partitioner/ubuntu_and_os_format
 Type: text
 #flag:comment:2
 # OS is a variable substituted into this string, and may be 'Windows 7'
 # CURDISTRO is a variable substituted into this string, and may be 'Ubuntu 10.10'
-_Description: Erase everything and reinstall
- <span foreground="darkred">Warning:</span> This will delete all your
- programs, documents, photos, music, and other files in both ${OS} and
- ${CURDISTRO}.
+_Description: Erase whole disk (will delete ${OS} and ${CURDISTRO} and all data)
+ <span foreground="darkred">Warning:</span> This will delete everything on the
+disk, including other partitions, other operating systems, all your programs, documents, photos, music, and any other files.
 
 Template: ubiquity/partitioner/ubuntu_reinstall
 Type: text
@@ -1319,9 +1318,9 @@
 Type: text
 #flag:comment:1
 # DISTRO is a variable substituted into this string, and may be 'Ubuntu'
-_Description: Erase disk and install ${DISTRO}
- <span foreground="darkred">Warning:</span> This will delete all your programs,
- documents, photos, music, and any other files in all operating systems.
+_Description: Erase whole disk and install ${DISTRO} (will delete all other operating systems and all data)
+ <span foreground="darkred">Warning:</span>  This will delete everything on the
+disk, including other partitions, other operating systems, all your programs, documents, photos, music, and any other files.
 
 Template: ubiquity/partitioner/multiple_os_resize
 Type: text

=== modified file 'ubiquity/plugins/ubi-partman.py'
--- ubiquity/plugins/ubi-partman.py	2014-06-30 13:09:16 +0000
+++ ubiquity/plugins/ubi-partman.py	2014-08-29 15:27:45 +0000
@@ -2202,8 +2202,8 @@
             # of the ones offered in the replace options.
             ubuntu = ubuntu_systems[0]
             if 'replace' in self.extra_options:
-                q = 'ubiquity/partitioner/ubuntu_format'
-                self.db.subst(q, 'CURDISTRO', ubuntu)
+                q = 'ubiquity/partitioner/single_os_replace'
+                self.db.subst(q, 'OS', ubuntu)
                 title = self.description(q)
                 desc = self.extended_description(q)
                 opt = PartitioningOption(title, desc)