Merge lp:~xnox/usb-creator/wipeout into lp:usb-creator

[Dimitri John Ledkov]

Merge a (modified) patch from bug #484252. This changes the format button to erase selected partition, instead of wiping the whole drive (potential data loss).

[Dimitri John Ledkov (xnox)]

* tested formatting with multi partition usb-stick
* tested booting created bootable usb using multi partitioned usb-stick

Unmerged revisions

=== modified file 'bin/usb-creator-helper'
--- bin/usb-creator-helper	2012-05-04 10:43:38 +0000
+++ bin/usb-creator-helper	2012-05-21 08:49:17 +0000
@@ -214,18 +214,29 @@
                                    '/org/freedesktop/UDisks')
         device = udisks.FindDeviceByDeviceFile(device, dbus_interface=DISKS_IFACE)
         dev = bus.get_object(DISKS_IFACE, device)
-        # Use the disk if asked to format a partition.
-        if dev.Get(device, 'device-is-partition', dbus_interface=PROPS_IFACE):
-            device = dev.Get(device, 'partition-slave', dbus_interface=PROPS_IFACE)
-            dev = bus.get_object(DISKS_IFACE, device)
-        dev_file = dev.Get(device, 'device-file', dbus_interface=PROPS_IFACE)
+
         # TODO LOCK
         unmount_all(device)
-        size = dev.Get(device, 'device-size', dbus_interface=PROPS_IFACE)
-        dev.PartitionTableCreate('mbr', [], dbus_interface=DEVICE_IFACE, timeout=600)
-        dev.PartitionCreate(0, size, '0x0c', '', ['boot'], [], 'vfat', [],
-                            dbus_interface=DEVICE_IFACE)
+        # Do NOT use the disk if asked to format a partition.
+        # We still need to obtain the disk device name to zero out the MBR
+        if dev.Get(device, 'device-is-partition', dbus_interface=PROPS_IFACE):
+            # Create the partition
+            dev.PartitionModify('0x0c', '', ['boot'], dbus_interface=DEVICE_IFACE)
+            dev.FilesystemCreate('vfat', [], dbus_interface=DEVICE_IFACE)
+
+            # Get the master device
+            device = dev.Get(device, 'partition-slave', dbus_interface=PROPS_IFACE)
+            dev = bus.get_object(DISKS_IFACE, device)
+        else:
+            # Create a new partition table and a FAT partition.
+            size = dev.Get(device, 'device-size', dbus_interface=PROPS_IFACE)
+            dev.PartitionTableCreate('mbr', [], dbus_interface=DEVICE_IFACE,
+                timeout=600)
+            dev.PartitionCreate(0, size, '0x0c', '', ['boot'], [], 'vfat', [],
+                                dbus_interface=DEVICE_IFACE)
+
         # Zero out the MBR.  Will require fancy privileges.
+        dev_file = dev.Get(device, 'device-file', dbus_interface=PROPS_IFACE)
         popen(['dd', 'if=/dev/zero', 'of=%s' % dev_file, 'bs=446', 'count=1'])
         # TODO UNLOCK
 

=== modified file 'po/usbcreator.pot'
--- po/usbcreator.pot	2011-05-19 16:58:02 +0000
+++ po/usbcreator.pot	2012-05-21 08:49:17 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-19 17:55+0100\n"
+"POT-Creation-Date: 2012-05-17 09:43+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,19 +17,19 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: .././usbcreator/install.py:133
+#: .././usbcreator/install.py:138
 #, python-format
 msgid "The extension \"%s\" is not supported."
 msgstr ""
 
-#: .././usbcreator/install.py:148
+#: .././usbcreator/install.py:153
 #, python-format
 msgid ""
 "An uncaught exception was raised:\n"
 "%s"
 msgstr ""
 
-#: .././usbcreator/install.py:164
+#: .././usbcreator/install.py:169
 #, python-format
 msgid ""
 "Insufficient free space to write the image:\n"
@@ -38,48 +38,48 @@
 "(%d MB) > %s (%d MB)"
 msgstr ""
 
-#: .././usbcreator/install.py:191
+#: .././usbcreator/install.py:222
 msgid "Installing the bootloader..."
 msgstr ""
 
-#: .././usbcreator/install.py:192
+#: .././usbcreator/install.py:223
 msgid "Failed to install the bootloader."
 msgstr ""
 
-#: .././usbcreator/install.py:221
+#: .././usbcreator/install.py:253
 msgid "Modifying configuration..."
 msgstr ""
 
 #. Failure here probably means the source was not really an Ubuntu
 #. image and did not have the files we wanted to move, see
 #. <https://bugs.launchpad.net/launchpad-code/+bug/513432>
-#: .././usbcreator/install.py:232
+#: .././usbcreator/install.py:264
 #, python-format
 msgid ""
 "Could not move syslinux files in \"%s\": %s. Maybe \"%s\" is not an Ubuntu "
 "image?"
 msgstr ""
 
-#: .././usbcreator/install.py:324
+#: .././usbcreator/install.py:335
 msgid "Creating a persistence file..."
 msgstr ""
 
-#: .././usbcreator/install.py:327
+#: .././usbcreator/install.py:338
 msgid "Creating an ext2 filesystem in the persistence file..."
 msgstr ""
 
-#: .././usbcreator/install.py:339
+#: .././usbcreator/install.py:350
 msgid "Finishing..."
 msgstr ""
 
 #. TODO evand 2009-09-02: Disabled until we can find a cross-platform
 #. way of determining dd progress.
 #. self.initialize_progress_thread()
-#: .././usbcreator/install.py:362
+#: .././usbcreator/install.py:373
 msgid "Writing disk image..."
 msgstr ""
 
-#: .././usbcreator/install.py:363
+#: .././usbcreator/install.py:374
 #, python-format
 msgid "Could not write the disk image (%s) to the device (%s)."
 msgstr ""
@@ -87,23 +87,23 @@
 #. Clear.
 #. Some of the code in this function was copied from Ubiquity's
 #. scripts/install.py
-#: .././usbcreator/install.py:404 .././usbcreator/install.py:517
+#: .././usbcreator/install.py:415 .././usbcreator/install.py:528
 msgid "Removing files..."
 msgstr ""
 
-#: .././usbcreator/install.py:435 .././usbcreator/install.py:540
+#: .././usbcreator/install.py:446 .././usbcreator/install.py:551
 msgid "Copying files..."
 msgstr ""
 
-#: .././usbcreator/install.py:464
+#: .././usbcreator/install.py:475
 msgid "md5 checksums do not match."
 msgstr ""
 
-#: .././usbcreator/install.py:493
+#: .././usbcreator/install.py:504
 msgid "Installing the EFI bootloader..."
 msgstr ""
 
-#: .././usbcreator/install.py:494
+#: .././usbcreator/install.py:505
 msgid "Failed to install the EFI bootloader."
 msgstr ""
 
@@ -112,73 +112,73 @@
 #. user the option of selecting the re-inserted disk
 #. from a drop down list and continuing.
 #. TODO evand 2009-07-23: Fail more gracefully.
-#: .././usbcreator/install.py:612
+#: .././usbcreator/install.py:623
 #, python-format
 msgid "Could not read from %s"
 msgstr ""
 
-#: .././usbcreator/install.py:637
+#: .././usbcreator/install.py:648
 msgid "Checksums do not match.  Retry?"
 msgstr ""
 
-#: .././usbcreator/install.py:641
+#: .././usbcreator/install.py:652
 msgid "Checksums do not match."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:343 usbcreator-kde.ui.py:12
+#: .././usbcreator/frontends/gtk/frontend.py:346 usbcreator-kde.ui.py:12
 msgid "CD-Drive/Image"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:356
+#: .././usbcreator/frontends/gtk/frontend.py:359
 #: .././usbcreator/frontends/winui/main_dialog.py:28 usbcreator-kde.ui.py:15
 msgid "OS Version"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. encode to UTF-8 to work around GNOME #620579
-#: .././usbcreator/frontends/gtk/frontend.py:367
+#: .././usbcreator/frontends/gtk/frontend.py:370
 #: .././usbcreator/frontends/winui/main_dialog.py:29 usbcreator-kde.ui.py:18
 msgid "Size"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:440
-#: .././usbcreator/frontends/kde/frontend.py:368
-#: usbcreator/frontends/kde/frontend.py:368
+#: .././usbcreator/frontends/gtk/frontend.py:442
+#: .././usbcreator/frontends/kde/frontend.py:372
+#: usbcreator/frontends/kde/frontend.py:372
 msgid "The device is not large enough to hold this image."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:442
-#: .././usbcreator/frontends/kde/frontend.py:370
-#: usbcreator/frontends/kde/frontend.py:370
+#: .././usbcreator/frontends/gtk/frontend.py:444
+#: .././usbcreator/frontends/kde/frontend.py:374
+#: usbcreator/frontends/kde/frontend.py:374
 msgid "There is not enough free space for this image."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:474
-#: .././usbcreator/frontends/gtk/frontend.py:739
+#: .././usbcreator/frontends/gtk/frontend.py:476
+#: .././usbcreator/frontends/gtk/frontend.py:745
 msgid "Erasing..."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:479
-#: .././gui/usbcreator-gtk.ui.h:4 usbcreator-kde.ui.py:43
+#: .././usbcreator/frontends/gtk/frontend.py:481
+#: .././gui/usbcreator-gtk.ui.h:15 usbcreator-kde.ui.py:42
 msgid "Erase Disk"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:533
+#: .././usbcreator/frontends/gtk/frontend.py:535
 #: .././usbcreator/frontends/winui/main_dialog.py:36 usbcreator-kde.ui.py:30
 msgid "Device"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:549
+#: .././usbcreator/frontends/gtk/frontend.py:551
 #: .././usbcreator/frontends/winui/main_dialog.py:37 usbcreator-kde.ui.py:33
 msgid "Label"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:559
+#: .././usbcreator/frontends/gtk/frontend.py:561
 #: .././usbcreator/frontends/winui/main_dialog.py:38 usbcreator-kde.ui.py:36
 msgid "Capacity"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:569
+#: .././usbcreator/frontends/gtk/frontend.py:571
 #: .././usbcreator/frontends/winui/main_dialog.py:39 usbcreator-kde.ui.py:39
 msgid "Free Space"
 msgstr ""
@@ -187,61 +187,61 @@
 #. TODO evand 2009-07-28: The list itself needs to be moved into the
 #. base frontend.
 #. To be displayed as a list of file type filters.
-#: .././usbcreator/frontends/gtk/frontend.py:581
-#: .././usbcreator/frontends/winui/frontend.py:177
-#: .././usbcreator/frontends/kde/frontend.py:406
-#: usbcreator/frontends/kde/frontend.py:406
+#: .././usbcreator/frontends/gtk/frontend.py:583
+#: .././usbcreator/frontends/winui/frontend.py:181
+#: .././usbcreator/frontends/kde/frontend.py:410
+#: usbcreator/frontends/kde/frontend.py:410
 msgid "CD Images"
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:581
-#: .././usbcreator/frontends/winui/frontend.py:178
-#: .././usbcreator/frontends/kde/frontend.py:406
-#: usbcreator/frontends/kde/frontend.py:406
+#: .././usbcreator/frontends/gtk/frontend.py:583
+#: .././usbcreator/frontends/winui/frontend.py:182
+#: .././usbcreator/frontends/kde/frontend.py:410
+#: usbcreator/frontends/kde/frontend.py:410
 msgid "Disk Images"
 msgstr ""
 
 #. TODO evand 2009-07-31: Make these the default values in the
 #. GtkBuilder file.
-#: .././usbcreator/frontends/gtk/frontend.py:602
+#: .././usbcreator/frontends/gtk/frontend.py:604
 #: .././usbcreator/frontends/winui/install_window.py:28
 msgid "Starting up..."
 msgstr ""
 
-#: .././usbcreator/frontends/gtk/frontend.py:629
-#: .././usbcreator/frontends/winui/frontend.py:151
-#, python-format
-msgid "%d%% complete (%dm%ss remaining)"
-msgstr ""
-
 #: .././usbcreator/frontends/gtk/frontend.py:633
 #: .././usbcreator/frontends/winui/frontend.py:155
 #, python-format
+msgid "%d%% complete (%dm%ss remaining)"
+msgstr ""
+
+#: .././usbcreator/frontends/gtk/frontend.py:637
+#: .././usbcreator/frontends/winui/frontend.py:159
+#, python-format
 msgid "%d%% complete"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO evand 2009-07-28: Better error message.
-#: .././usbcreator/frontends/gtk/frontend.py:678
-#: .././usbcreator/frontends/winui/frontend.py:85
-#: .././usbcreator/frontends/kde/frontend.py:208
-#: usbcreator/frontends/kde/frontend.py:208
+#: .././usbcreator/frontends/gtk/frontend.py:683
+#: .././usbcreator/frontends/winui/frontend.py:87
+#: .././usbcreator/frontends/kde/frontend.py:211
+#: usbcreator/frontends/kde/frontend.py:211
 msgid "Installation failed."
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. TODO information about the device we're about to format.
-#: .././usbcreator/frontends/gtk/frontend.py:734
-#: .././usbcreator/frontends/kde/frontend.py:515
-#: usbcreator/frontends/kde/frontend.py:515
+#: .././usbcreator/frontends/gtk/frontend.py:740
+#: .././usbcreator/frontends/kde/frontend.py:519
+#: usbcreator/frontends/kde/frontend.py:519
 msgid "Are you sure you want to erase the entire disk?"
 msgstr ""
 
 #. #-#-#-#-#  usbcreator.pot (PACKAGE VERSION)  #-#-#-#-#
 #. set title of progress window (same as gtk frontend)
 #: .././usbcreator/frontends/winui/install_window.py:23
-#: .././usbcreator/frontends/kde/frontend.py:180
-#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:180
+#: .././usbcreator/frontends/kde/frontend.py:183
+#: .././gui/usbcreator-gtk.ui.h:7 usbcreator/frontends/kde/frontend.py:183
 msgid "Installing"
 msgstr ""
 
@@ -249,41 +249,41 @@
 msgid "&Cancel"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:71
-#: .././usbcreator/frontends/kde/frontend.py:458
-#: usbcreator/frontends/kde/frontend.py:458
+#: .././usbcreator/frontends/winui/frontend.py:73
+#: .././usbcreator/frontends/kde/frontend.py:462
+#: usbcreator/frontends/kde/frontend.py:462
 msgid ""
 "The installation is complete.  You may now reboot your computer with this "
 "device inserted to try or install Ubuntu."
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:74
+#: .././usbcreator/frontends/winui/frontend.py:76
 msgid "Installation complete"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:80
+#: .././usbcreator/frontends/winui/frontend.py:82
 msgid "Installation failed"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:179
+#: .././usbcreator/frontends/winui/frontend.py:183
 msgid "All"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/frontend.py:189
+#: .././usbcreator/frontends/winui/frontend.py:193
 #: .././gui/usbcreator-gtk.ui.h:10 usbcreator-kde.ui.py:3
-#: usbcreator-kde.ui.py:61
+#: usbcreator-kde.ui.py:60
 msgid "Make Startup Disk"
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:21
-#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:6
+#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:6
 msgid ""
 "To try or install Ubuntu from a removable disk, it needs to be set up as a "
 "startup disk."
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:24
-#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:9
+#: .././gui/usbcreator-gtk.ui.h:12 usbcreator-kde.ui.py:9
 msgid "Source disc image (.iso) or CD:"
 msgstr ""
 
@@ -292,7 +292,7 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:32
-#: .././gui/usbcreator-gtk.ui.h:11 usbcreator-kde.ui.py:24
+#: .././gui/usbcreator-gtk.ui.h:13 usbcreator-kde.ui.py:24
 msgid "Other..."
 msgstr ""
 
@@ -301,7 +301,7 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:42
-#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:46
+#: .././gui/usbcreator-gtk.ui.h:16 usbcreator-kde.ui.py:45
 msgid "When starting up from this disk, documents and settings will be:"
 msgstr ""
 
@@ -310,16 +310,16 @@
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:46
-#: .././gui/usbcreator-gtk.ui.h:5 usbcreator-kde.ui.py:52
+#: .././gui/usbcreator-gtk.ui.h:18 usbcreator-kde.ui.py:51
 msgid "How much:"
 msgstr ""
 
 #: .././usbcreator/frontends/winui/main_dialog.py:52
-#: .././gui/usbcreator-gtk.ui.h:1 usbcreator-kde.ui.py:58
+#: .././gui/usbcreator-gtk.ui.h:19 usbcreator-kde.ui.py:57
 msgid "Discarded on shutdown, unless you save them elsewhere"
 msgstr ""
 
-#: .././usbcreator/frontends/winui/main_dialog.py:56 usbcreator-kde.ui.py:64
+#: .././usbcreator/frontends/winui/main_dialog.py:56 usbcreator-kde.ui.py:63
 msgid "Quit"
 msgstr ""
 
@@ -327,126 +327,126 @@
 msgid "Make startup disk"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:373
-#: usbcreator/frontends/kde/frontend.py:373
+#: .././usbcreator/frontends/kde/frontend.py:377
+#: usbcreator/frontends/kde/frontend.py:377
 msgid "The device needs to be formatted for use."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:422
-#: usbcreator/frontends/kde/frontend.py:422
+#: .././usbcreator/frontends/kde/frontend.py:426
+#: usbcreator/frontends/kde/frontend.py:426
 msgid "Starting up"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:431
-#: usbcreator/frontends/kde/frontend.py:431
+#: .././usbcreator/frontends/kde/frontend.py:435
+#: usbcreator/frontends/kde/frontend.py:435
 msgid "You must select both source image and target device first."
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:469
-#: usbcreator/frontends/kde/frontend.py:469
+#: .././usbcreator/frontends/kde/frontend.py:473
+#: usbcreator/frontends/kde/frontend.py:473
 msgid "Retry?"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:481
-#: .././gui/usbcreator-gtk.ui.h:12 usbcreator/frontends/kde/frontend.py:481
+#: .././usbcreator/frontends/kde/frontend.py:485
+#: .././gui/usbcreator-gtk.ui.h:8 usbcreator/frontends/kde/frontend.py:485
 msgid "Quit the installation?"
 msgstr ""
 
-#: .././usbcreator/frontends/kde/frontend.py:482
-#: .././gui/usbcreator-gtk.ui.h:3 usbcreator/frontends/kde/frontend.py:482
+#: .././usbcreator/frontends/kde/frontend.py:486
+#: .././gui/usbcreator-gtk.ui.h:9 usbcreator/frontends/kde/frontend.py:486
 msgid "Do you really want to quit the installation now?"
 msgstr ""
 
 #: .././desktop/usb-creator-kde.desktop.in.h:1
 #: .././desktop/usb-creator-gtk.desktop.in.h:1
-msgid "Create a startup disk using a CD or disc image"
+msgid "Startup Disk Creator"
 msgstr ""
 
 #: .././desktop/usb-creator-kde.desktop.in.h:2
 #: .././desktop/usb-creator-gtk.desktop.in.h:2
-msgid "Startup Disk Creator"
-msgstr ""
-
-#: .././gui/usbcreator-gtk.ui.h:2 usbcreator-kde.ui.py:27
-msgid "Disk to use:"
+msgid "Create a startup disk using a CD or disc image"
+msgstr ""
+
+#: .././gui/usbcreator-gtk.ui.h:1
+msgid "Installation Failed"
+msgstr ""
+
+#: .././gui/usbcreator-gtk.ui.h:2
+msgid ""
+"The installation failed.  Please see ~/.cache/usb-creator.log for more "
+"details.\n"
+msgstr ""
+
+#: .././gui/usbcreator-gtk.ui.h:4
+msgid "Installation Complete"
+msgstr ""
+
+#: .././gui/usbcreator-gtk.ui.h:5
+msgid "Test Disk"
 msgstr ""
 
 #: .././gui/usbcreator-gtk.ui.h:6
-msgid "Installation Complete"
-msgstr ""
-
-#: .././gui/usbcreator-gtk.ui.h:7
-msgid "Installation Failed"
-msgstr ""
-
-#: .././gui/usbcreator-gtk.ui.h:8
 msgid ""
 "Installation is complete.  You may now run Ubuntu on other computers by "
 "booting them with this drive inserted."
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:49
+#: .././gui/usbcreator-gtk.ui.h:14 usbcreator-kde.ui.py:27
+msgid "Disk to use:"
+msgstr ""
+
+#: .././gui/usbcreator-gtk.ui.h:17 usbcreator-kde.ui.py:48
 msgid "Stored in reserved extra space"
 msgstr ""
 
-#: .././gui/usbcreator-gtk.ui.h:15
-msgid "Test Disk"
-msgstr ""
-
-#: .././gui/usbcreator-gtk.ui.h:16
-msgid ""
-"The installation failed.  Please see ~/.cache/usb-creator.log for more "
-"details.\n"
-msgstr ""
-
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:1
-msgid "Format the device"
+msgid "Install the bootloader"
 msgstr ""
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:2
-msgid "Image the device"
+msgid "System policy prevents installing the bootloader"
 msgstr ""
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:3
-msgid "Install the bootloader"
+msgid "Format the device"
 msgstr ""
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:4
-msgid "Mount a device"
+msgid "System policy prevents formatting this device"
 msgstr ""
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:5
-msgid "System policy prevents formatting this device"
+msgid "Image the device"
 msgstr ""
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:6
-msgid "System policy prevents installing the bootloader"
+msgid "System policy prevents writing a disk image to this device"
 msgstr ""
 
 #: .././dbus/com.ubuntu.usbcreator.policy.in.h:7
+msgid "Mount a device"
+msgstr ""
+
+#: .././dbus/com.ubuntu.usbcreator.policy.in.h:8
 msgid "System policy prevents mounting"
 msgstr ""
 
-#: .././dbus/com.ubuntu.usbcreator.policy.in.h:8
-msgid "System policy prevents writing a disk image to this device"
+#: .././main.py:37
+msgid "Please run this program as an administrator to continue."
 msgstr ""
 
 #: .././main.py:38
-msgid "Please run this program as an administrator to continue."
-msgstr ""
-
-#: .././main.py:39
 msgid "Administrator privileges required"
 msgstr ""
 
+#: .././main.py:55
+#, python-format
+msgid ""
+"An unhandled exception occurred:\n"
+"%s"
+msgstr ""
+
 #: .././main.py:56
-#, python-format
-msgid ""
-"An unhandled exception occurred:\n"
-"%s"
-msgstr ""
-
-#: .././main.py:57
 msgid "Error"
 msgstr ""
 
@@ -454,10 +454,10 @@
 msgid "Please insert a CD or select 'Other...'."
 msgstr ""
 
-#: usbcreator-kde.ui.py:55
+#: usbcreator-kde.ui.py:54
 msgid "0.0 MB"
 msgstr ""
 
-#: usbcreator/frontends/kde/frontend.py:178
+#: usbcreator/frontends/kde/frontend.py:181
 msgid "Cancel"
 msgstr ""

=== modified file 'usbcreator/backends/udisks/backend.py'
--- usbcreator/backends/udisks/backend.py	2012-05-04 10:33:25 +0000
+++ usbcreator/backends/udisks/backend.py	2012-05-21 08:49:17 +0000
@@ -284,10 +284,6 @@
         try:
             dk = self.bus.get_object(DISKS_IFACE, device)
             dev = dk.Get(device, 'device-file', dbus_interface=PROPS_IFACE)
-            if dk.Get(dev, 'device-is-partition', dbus_interface=PROPS_IFACE):
-                dev = dk.Get(dev, 'partition-slave', dbus_interface=PROPS_IFACE)
-                dk = self.bus.get_object(DISKS_IFACE, dev)
-                dev = dk.Get(device, 'device-file', dbus_interface=PROPS_IFACE)
             p = self.targets[device]['parent']
             if p and p in self.targets:
                 self.formatting.append(p)