[gnome-disk-utility] Update British English translation



commit fd27af71cdf596d870f62091ab1739d032c9aa3d
Author: Bruce Cowan <bruce bcowan me uk>
Date:   Mon Sep 3 18:42:50 2012 +0100

    Update British English translation

 po/en_GB.po | 2103 ++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1373 insertions(+), 730 deletions(-)
---
diff --git a/po/en_GB.po b/po/en_GB.po
index cee456e..aad8c18 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-disk-utility\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-13 13:25+0100\n"
-"PO-Revision-Date: 2012-04-13 13:26+0100\n"
+"POT-Creation-Date: 2012-09-03 18:35+0100\n"
+"PO-Revision-Date: 2012-09-03 18:41+0100\n"
 "Last-Translator: Bruce Cowan <bruce bcowan me uk>\n"
 "Language-Team: British English <en li org>\n"
 "Language: en_GB\n"
@@ -19,15 +19,36 @@ msgstr ""
 "X-Generator: Virtaal 0.7.1\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/palimpsest.desktop.in.h:1 ../data/ui/about-dialog.ui.h:1
-#: ../src/palimpsest/gduwindow.c:888
+#: ../data/gnome-disk-image-mounter.desktop.in.h:1
+#: ../src/disk-image-mounter/main.c:46
+msgid "Disk Image Mounter"
+msgstr "Disk Image Mounter"
+
+#: ../data/gnome-disk-image-mounter.desktop.in.h:2
+msgid "Mount Disk Images"
+msgstr "Mount Disk Images"
+
+#: ../data/gnome-disks.desktop.in.h:1 ../data/ui/about-dialog.ui.h:1
+#: ../src/disks/gduwindow.c:1000
 msgid "Disks"
 msgstr "Disks"
 
-#: ../data/palimpsest.desktop.in.h:2
+#: ../data/gnome-disks.desktop.in.h:2
 msgid "Manage Drives and Media"
 msgstr "Manage Drives and Media"
 
+#: ../data/org.gnome.Disks.gschema.xml.in.in.h:1
+msgid "Default location for the Create/Restore disk image dialogs"
+msgstr "Default location for the Create/Restore disk image dialogues"
+
+#: ../data/org.gnome.Disks.gschema.xml.in.in.h:2
+msgid ""
+"Default location for the Create/Restore disk image dialogs. If blank the ~/"
+"Documents folder is used."
+msgstr ""
+"Default location for the Create/Restore disk image dialogues. If blank the "
+"~/Documents folder is used."
+
 #: ../data/ui/about-dialog.ui.h:2
 msgid ""
 "Copyright  2008-2012 Red Hat, Inc.\n"
@@ -58,6 +79,122 @@ msgstr "_About Disks"
 msgid "_Quit"
 msgstr "_Quit"
 
+#: ../data/ui/benchmark-dialog.ui.h:1
+msgid "_Start Benchmark..."
+msgstr "_Start Benchmarkâ"
+
+#: ../data/ui/benchmark-dialog.ui.h:2
+msgid "_Abort Benchmark"
+msgstr "_Abort Benchmark"
+
+#: ../data/ui/benchmark-dialog.ui.h:3
+msgid "Last Benchmarked"
+msgstr "Last Benchmarked"
+
+#: ../data/ui/benchmark-dialog.ui.h:4
+msgid "Average Read Rate"
+msgstr "Average Read Rate"
+
+#: ../data/ui/benchmark-dialog.ui.h:5
+msgid "Average Write Rate"
+msgstr "Average Write Rate"
+
+#: ../data/ui/benchmark-dialog.ui.h:6
+msgid "Average Access Time"
+msgstr "Average Access Time"
+
+#: ../data/ui/benchmark-dialog.ui.h:7
+msgid "Disk Drive or Device"
+msgstr "Disk Drive or Device"
+
+#: ../data/ui/benchmark-dialog.ui.h:8
+msgid "Sample Size"
+msgstr "Sample Size"
+
+#: ../data/ui/benchmark-dialog.ui.h:9
+msgid "_Start Benchmarking..."
+msgstr "_Start Benchmarkingâ"
+
+#: ../data/ui/benchmark-dialog.ui.h:10
+msgid ""
+"Benchmarking involves measuring the transfer rate on various area of the "
+"device as well as measuring how long it takes to seek from one random area "
+"to another. Please back up important data before using the write benchmark."
+msgstr ""
+"Benchmarking involves measuring the transfer rate on various area of the "
+"device as well as measuring how long it takes to seek from one random area "
+"to another. Please back up important data before using the write benchmark."
+
+#: ../data/ui/benchmark-dialog.ui.h:11
+msgid "Transfer Rate"
+msgstr "Transfer Rate"
+
+#: ../data/ui/benchmark-dialog.ui.h:12
+msgid "Number of S_amples"
+msgstr "Number of S_amples"
+
+#: ../data/ui/benchmark-dialog.ui.h:13
+msgid "Sample S_ize (MiB)"
+msgstr "Sample S_ize (MiB)"
+
+#: ../data/ui/benchmark-dialog.ui.h:14
+msgid "Also perform _write-benchmark"
+msgstr "Also perform _write-benchmark"
+
+#: ../data/ui/benchmark-dialog.ui.h:15
+msgid ""
+"Bechmarking the write-rate of a disk requires exclusive access to the disk "
+"(e.g. the disk or its partitions cannot be mounted or in use) and involves "
+"reading data and then writing it back. As a result, the contents of the disk "
+"is not changed.\n"
+"\n"
+"If not checked, the write-part of the benchmark will not be done but on the "
+"other hand exclusive access to the device is not needed (e.g. the disk or "
+"device can be in use) ."
+msgstr ""
+"Bechmarking the write-rate of a disk requires exclusive access to the disk "
+"(e.g. the disk or its partitions cannot be mounted or in use) and involves "
+"reading data and then writing it back. As a result, the contents of the disk "
+"is not changed.\n"
+"\n"
+"If not checked, the write-part of the benchmark will not be done but on the "
+"other hand exclusive access to the device is not needed (e.g. the disk or "
+"device can be in use) ."
+
+#: ../data/ui/benchmark-dialog.ui.h:18
+msgid ""
+"Number of samples. Bigger number produces a more accurate picture of access "
+"time patterns but takes more time."
+msgstr ""
+"Number of samples. Bigger number produces a more accurate picture of access "
+"time patterns but takes more time."
+
+#: ../data/ui/benchmark-dialog.ui.h:19
+msgid ""
+"The number of MiB (1048576 bytes) to read/write for each sample. Big sample "
+"sizes tend to produce more accurate benchmarks at the cost of the benchmark "
+"taking more time."
+msgstr ""
+"The number of MiB (1048576 bytes) to read/write for each sample. Big sample "
+"sizes tend to produce more accurate benchmarks at the cost of the benchmark "
+"taking more time."
+
+#: ../data/ui/benchmark-dialog.ui.h:20
+msgid "Access Time"
+msgstr "Access Time"
+
+#: ../data/ui/benchmark-dialog.ui.h:21
+msgid "Number of Sampl_es"
+msgstr "Number of Sampl_es"
+
+#: ../data/ui/benchmark-dialog.ui.h:22
+msgid ""
+"Number of samples. Bigger number produces more smooth graphs but the "
+"benchmark will take more time."
+msgstr ""
+"Number of samples. Bigger number produces more smooth graphs but the "
+"benchmark will take more time."
+
 #: ../data/ui/change-passphrase-dialog.ui.h:1
 #: ../data/ui/edit-dos-partition-dialog.ui.h:1
 #: ../data/ui/edit-filesystem-dialog.ui.h:2
@@ -67,8 +204,8 @@ msgid "C_hange"
 msgstr "C_hange"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:2
-msgid "<big>Change Passphrase</big>"
-msgstr "<big>Change Passphrase</big>"
+msgid "Change Passphrase"
+msgstr "Change Passphrase"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:3
 msgid "Curr_ent Passphrase"
@@ -107,39 +244,35 @@ msgid "New _Passphrase"
 msgstr "New _Passphrase"
 
 #: ../data/ui/create-disk-image-dialog.ui.h:1
-msgid "<big>Create Disk Image</big>"
-msgstr "<big>Create Disk Image</big>"
-
-#: ../data/ui/create-disk-image-dialog.ui.h:2
-msgid "_Start Creating..."
-msgstr "_Start Creatingâ"
-
-#: ../data/ui/create-disk-image-dialog.ui.h:3
 #: ../data/ui/edit-crypttab-dialog.ui.h:3
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:5
 #: ../data/ui/filesystem-create.ui.h:2
 msgid "_Name"
 msgstr "_Name"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:4
+#: ../data/ui/create-disk-image-dialog.ui.h:2
 msgid "Save in _folder"
 msgstr "Save in _folder"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:5
+#: ../data/ui/create-disk-image-dialog.ui.h:3
 msgid "Select a Folder"
 msgstr "Select a Folder"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:6
+#: ../data/ui/create-disk-image-dialog.ui.h:4
 msgid "Copying data to disk image..."
 msgstr "Copying data to disk imageâ"
 
+#: ../data/ui/create-disk-image-dialog.ui.h:5
+msgid "_Start Creating..."
+msgstr "_Start Creatingâ"
+
 #: ../data/ui/create-partition-dialog.ui.h:1
 msgid "C_reate"
 msgstr "C_reate"
 
 #: ../data/ui/create-partition-dialog.ui.h:2
-msgid "<big>Create Partition</big>"
-msgstr "<big>Create Partition</big>"
+msgid "Create Partition"
+msgstr "Create Partition"
 
 #: ../data/ui/create-partition-dialog.ui.h:3
 msgid "Partition _Size"
@@ -161,9 +294,221 @@ msgstr "Free Space _Following"
 msgid "The free space following the partition, in megabytes"
 msgstr "The free space following the partition, in megabytes"
 
-#: ../data/ui/create-partition-dialog.ui.h:8
-msgid "<big>Contents</big>"
-msgstr "<big>Contents</big>"
+#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap (version 2)'
+#: ../data/ui/create-partition-dialog.ui.h:8 ../data/ui/disks.ui.h:26
+msgid "Contents"
+msgstr "Contents"
+
+#: ../data/ui/disk-settings-dialog.ui.h:1
+msgid "_Standby Timeout"
+msgstr "_Standby Timeout"
+
+#: ../data/ui/disk-settings-dialog.ui.h:2
+msgid "Enter Standby After"
+msgstr "Enter Standby After"
+
+#: ../data/ui/disk-settings-dialog.ui.h:3
+msgid "_Advanced Power Management"
+msgstr "_Advanced Power Management"
+
+#: ../data/ui/disk-settings-dialog.ui.h:4
+msgid "APM Level"
+msgstr "APM Level"
+
+#: ../data/ui/disk-settings-dialog.ui.h:5
+msgid ""
+"Agressive spin-down may wear out the drive faster than anticipated. Please "
+"check the âStart/Stop Countâ SMART attribute from time to time"
+msgstr ""
+"Aggressive spin-down may wear out the drive faster than anticipated. Please "
+"check the âStart/Stop Countâ SMART attribute from time to time"
+
+#: ../data/ui/disk-settings-dialog.ui.h:6
+msgid "Automatic Aco_ustic Management"
+msgstr "Automatic Aco_ustic Management"
+
+#: ../data/ui/disk-settings-dialog.ui.h:7
+msgid "Vendor Recommended"
+msgstr "Vendor Recommended"
+
+#: ../data/ui/disk-settings-dialog.ui.h:8
+msgid "AAM Level"
+msgstr "AAM Level"
+
+#: ../data/ui/disks.ui.h:1
+msgid "Create a new partition..."
+msgstr "Create a new partitionâ"
+
+#: ../data/ui/disks.ui.h:2
+msgid "Mount the filesystem"
+msgstr "Mount the filesystem"
+
+#: ../data/ui/disks.ui.h:3
+msgid "Unmount the filesystem"
+msgstr "Unmount the filesystem"
+
+#: ../data/ui/disks.ui.h:4
+msgid "Eject the media"
+msgstr "Eject the medium"
+
+#: ../data/ui/disks.ui.h:5
+msgid "Unlock the encrypted device"
+msgstr "Unlock the encrypted device"
+
+#: ../data/ui/disks.ui.h:6
+msgid "Activate the swap space"
+msgstr "Activate the swap space"
+
+#: ../data/ui/disks.ui.h:7
+msgid "Deactivate the swap space"
+msgstr "Deactivate the swap space"
+
+#: ../data/ui/disks.ui.h:8
+msgid "Lock the encrypted device"
+msgstr "Lock the encrypted device"
+
+#: ../data/ui/disks.ui.h:9
+msgid "More actions..."
+msgstr "More actionsâ"
+
+#: ../data/ui/disks.ui.h:10
+msgid "Delete partition..."
+msgstr "Delete partitionâ"
+
+#: ../data/ui/disks.ui.h:11
+msgid "Attach Disk Image..."
+msgstr "Attach Disk Imageâ"
+
+#: ../data/ui/disks.ui.h:12
+msgid "Detach Disk Image"
+msgstr "Detach Disk Image"
+
+#: ../data/ui/disks.ui.h:13
+msgid "Select a device"
+msgstr "Select a device"
+
+#: ../data/ui/disks.ui.h:14
+msgid "Model"
+msgstr "Model"
+
+#: ../data/ui/disks.ui.h:15
+msgid "Serial Number"
+msgstr "Serial Number"
+
+#: ../data/ui/disks.ui.h:16
+msgid "World Wide Name"
+msgstr "World Wide Name"
+
+#. The physical location of the drive, could be 'Connected to another seat'  or 'Bay 11 of Promise VTrak' or 'USB connector II'
+#: ../data/ui/disks.ui.h:18
+msgid "Location"
+msgstr "Location"
+
+#: ../data/ui/disks.ui.h:19
+msgid "Media"
+msgstr "Media"
+
+#: ../data/ui/disks.ui.h:20
+msgid "Size"
+msgstr "Size"
+
+#. Translators: This string is used as the column title in the treeview for the assessment of the attribute
+#: ../data/ui/disks.ui.h:21 ../src/disks/gduatasmartdialog.c:1503
+msgid "Assessment"
+msgstr "Assessment"
+
+#: ../data/ui/disks.ui.h:22
+msgid "Eject media"
+msgstr "Eject medium"
+
+#: ../data/ui/disks.ui.h:23
+msgid "Pending Operation"
+msgstr "Pending Operation"
+
+#: ../data/ui/disks.ui.h:24
+msgid "_Volumes"
+msgstr "_Volumes"
+
+#: ../data/ui/disks.ui.h:27
+msgid "Device"
+msgstr "Device"
+
+#: ../data/ui/disks.ui.h:28
+msgid "In Use"
+msgstr "In Use"
+
+#: ../data/ui/disks.ui.h:29
+msgid "Auto-clear"
+msgstr "Auto-clear"
+
+#: ../data/ui/disks.ui.h:30
+msgid "Partition Type"
+msgstr "Partition Type"
+
+#. The filename or URI of the file that is used as backing store for the loop device.
+#: ../data/ui/disks.ui.h:32
+msgid "Backing File"
+msgstr "Backing File"
+
+#: ../data/ui/disks.ui.h:33
+msgid "Format Disk..."
+msgstr "Format Diskâ"
+
+#: ../data/ui/disks.ui.h:34
+msgid "Create Disk Image..."
+msgstr "Create Disk Imageâ"
+
+#: ../data/ui/disks.ui.h:35
+msgid "Restore Disk Image..."
+msgstr "Restore Disk Imageâ"
+
+#: ../data/ui/disks.ui.h:36
+msgid "Benchmark Drive..."
+msgstr "Benchmark Driveâ"
+
+#: ../data/ui/disks.ui.h:37
+msgid "SMART Data and Tests..."
+msgstr "SMART Data and Testsâ"
+
+#: ../data/ui/disks.ui.h:38
+msgid "Drive Settings..."
+msgstr "Drive Settingsâ"
+
+#: ../data/ui/disks.ui.h:39
+msgid "Standby Now"
+msgstr "Standby Now"
+
+#: ../data/ui/disks.ui.h:40
+msgid "Wake-Up from Standby"
+msgstr "Wake-Up from Standby"
+
+#: ../data/ui/disks.ui.h:41
+msgid "Format..."
+msgstr "Formatâ"
+
+#: ../data/ui/disks.ui.h:42
+msgid "Edit Partition Type..."
+msgstr "Edit Partition Typeâ"
+
+#: ../data/ui/disks.ui.h:43
+msgid "Edit Filesystem Label..."
+msgstr "Edit Filesystem Labelâ"
+
+#: ../data/ui/disks.ui.h:44
+msgid "Change Passphrase..."
+msgstr "Change Passphraseâ"
+
+#: ../data/ui/disks.ui.h:45
+msgid "Edit Mount Options..."
+msgstr "Edit Mount Optionsâ"
+
+#: ../data/ui/disks.ui.h:46
+msgid "Edit Encryption Options..."
+msgstr "Edit Encryption Optionsâ"
+
+#: ../data/ui/disks.ui.h:47
+msgid "Benchmark Volume..."
+msgstr "Benchmark Volumeâ"
 
 #: ../data/ui/edit-crypttab-dialog.ui.h:1
 msgid "_Automatic Encryption Options"
@@ -240,8 +585,8 @@ msgstr ""
 #: ../data/ui/edit-dos-partition-dialog.ui.h:2
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:2
 #: ../data/ui/edit-partition-dialog.ui.h:2
-msgid "<big>Edit Partition</big>"
-msgstr "<big>Edit Partition</big>"
+msgid "Edit Partition"
+msgstr "Edit Partition"
 
 #: ../data/ui/edit-dos-partition-dialog.ui.h:3
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:3
@@ -268,8 +613,8 @@ msgstr ""
 "the <i>active</i> partition"
 
 #: ../data/ui/edit-filesystem-dialog.ui.h:1
-msgid "<big>Change Filesystem Label</big>"
-msgstr "<big>Change Filesystem Label</big>"
+msgid "Change Filesystem Label"
+msgstr "Change Filesystem Label"
 
 #: ../data/ui/edit-filesystem-dialog.ui.h:3
 msgid "_Label"
@@ -495,186 +840,40 @@ msgstr "The custom filesystem type to create e.g. btrfs, xfs or swap"
 msgid "Enter passphrase used to protect the data"
 msgstr "Enter passphrase used to protect the data"
 
+#: ../data/ui/filesystem-create.ui.h:14 ../data/ui/format-disk-dialog.ui.h:4
+msgid "_Erase"
+msgstr "_Erase"
+
 #: ../data/ui/format-disk-dialog.ui.h:1 ../data/ui/format-volume-dialog.ui.h:1
 msgid "_Format..."
 msgstr "_Formatâ"
 
 #: ../data/ui/format-disk-dialog.ui.h:2
-msgid "<big>Format Disk</big>"
-msgstr "<big>Format Disk</big>"
+msgid "Format Disk"
+msgstr "Format Disk"
 
 #: ../data/ui/format-disk-dialog.ui.h:3
 msgid "_Partitioning"
 msgstr "_Partitioning"
 
 #: ../data/ui/format-volume-dialog.ui.h:2
-msgid "<big>Format Volume</big>"
-msgstr "<big>Format Volume</big>"
-
-#: ../data/ui/palimpsest.ui.h:1
-msgid "Create a new partition..."
-msgstr "Create a new partitionâ"
-
-#: ../data/ui/palimpsest.ui.h:2
-msgid "Mount the filesystem"
-msgstr "Mount the filesystem"
-
-#: ../data/ui/palimpsest.ui.h:3
-msgid "Unmount the filesystem"
-msgstr "Unmount the filesystem"
-
-#: ../data/ui/palimpsest.ui.h:4
-msgid "Eject the media"
-msgstr "Eject the medium"
-
-#: ../data/ui/palimpsest.ui.h:5
-msgid "Unlock the encrypted device"
-msgstr "Unlock the encrypted device"
-
-#: ../data/ui/palimpsest.ui.h:6
-msgid "Activate the swap space"
-msgstr "Activate the swap space"
-
-#: ../data/ui/palimpsest.ui.h:7
-msgid "Deactivate the swap space"
-msgstr "Deactivate the swap space"
-
-#: ../data/ui/palimpsest.ui.h:8
-msgid "Lock the encrypted device"
-msgstr "Lock the encrypted device"
-
-#: ../data/ui/palimpsest.ui.h:9
-msgid "More actions..."
-msgstr "More actionsâ"
-
-#: ../data/ui/palimpsest.ui.h:10
-msgid "Delete partition..."
-msgstr "Delete partitionâ"
-
-#: ../data/ui/palimpsest.ui.h:11
-msgid "Format Disk..."
-msgstr "Format Diskâ"
-
-#: ../data/ui/palimpsest.ui.h:12
-msgid "Create Disk Image..."
-msgstr "Create Disk Imageâ"
-
-#: ../data/ui/palimpsest.ui.h:13
-msgid "Restore Disk Image..."
-msgstr "Restore Disk Imageâ"
-
-#: ../data/ui/palimpsest.ui.h:14
-msgid "View SMART Data..."
-msgstr "View SMART Dataâ"
-
-#: ../data/ui/palimpsest.ui.h:15
-msgid "Format..."
-msgstr "Formatâ"
-
-#: ../data/ui/palimpsest.ui.h:16
-msgid "Edit Partition Type..."
-msgstr "Edit Partition Typeâ"
-
-#: ../data/ui/palimpsest.ui.h:17
-msgid "Edit Filesystem Label..."
-msgstr "Edit Filesystem Labelâ"
-
-#: ../data/ui/palimpsest.ui.h:18
-msgid "Change Passphrase..."
-msgstr "Change Passphraseâ"
-
-#: ../data/ui/palimpsest.ui.h:19
-msgid "Edit Mount Options..."
-msgstr "Edit Mount Optionsâ"
-
-#: ../data/ui/palimpsest.ui.h:20
-msgid "Edit Encryption Options..."
-msgstr "Edit Encryption Optionsâ"
-
-#: ../data/ui/palimpsest.ui.h:21
-msgid "Attach Disk Image..."
-msgstr "Attach Disk Imageâ"
-
-#: ../data/ui/palimpsest.ui.h:22
-msgid "Detach Disk Image"
-msgstr "Detach Disk Image"
-
-#: ../data/ui/palimpsest.ui.h:23
-msgid "Select a device"
-msgstr "Select a device"
-
-#: ../data/ui/palimpsest.ui.h:24
-msgid "Model"
-msgstr "Model"
-
-#: ../data/ui/palimpsest.ui.h:25
-msgid "Serial Number"
-msgstr "Serial Number"
-
-#: ../data/ui/palimpsest.ui.h:26
-msgid "World Wide Name"
-msgstr "World Wide Name"
-
-#: ../data/ui/palimpsest.ui.h:27
-msgid "Media"
-msgstr "Media"
-
-#: ../data/ui/palimpsest.ui.h:28
-msgid "Size"
-msgstr "Size"
-
-#. Translators: This string is used as the column title in the treeview for the assessment of the attribute
-#: ../data/ui/palimpsest.ui.h:29 ../src/palimpsest/gduatasmartdialog.c:1632
-msgid "Assessment"
-msgstr "Assessment"
-
-#: ../data/ui/palimpsest.ui.h:30
-msgid "Eject media"
-msgstr "Eject medium"
-
-#: ../data/ui/palimpsest.ui.h:31
-msgid "<b>_Volumes</b>"
-msgstr "<b>_Volumes</b>"
-
-#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap (version 2)'
-#: ../data/ui/palimpsest.ui.h:33
-msgid "Contents"
-msgstr "Contents"
-
-#: ../data/ui/palimpsest.ui.h:34
-msgid "Device"
-msgstr "Device"
-
-#: ../data/ui/palimpsest.ui.h:35
-msgid "In Use"
-msgstr "In Use"
-
-#: ../data/ui/palimpsest.ui.h:36
-msgid "Partition Type"
-msgstr "Partition Type"
-
-#. The filename or URI of the file that is used as backing store for the loop device.
-#: ../data/ui/palimpsest.ui.h:38
-msgid "Backing File"
-msgstr "Backing File"
+msgid "Format Volume"
+msgstr "Format Volume"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:1
-msgid "<big>Restore Disk Image</big>"
-msgstr "<big>Restore Disk Image</big>"
-
-#: ../data/ui/restore-disk-image-dialog.ui.h:2
 msgid "_Image to restore"
 msgstr "_Image to restore"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:3
+#: ../data/ui/restore-disk-image-dialog.ui.h:2
 msgid "Select Disk Image to restore"
 msgstr "Select Disk Image to restore"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:4
+#: ../data/ui/restore-disk-image-dialog.ui.h:3
+#: ../src/disks/gdurestorediskimagedialog.c:498
 msgid "Copying data to device..."
 msgstr "Copying data to deviceâ"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:5
+#: ../data/ui/restore-disk-image-dialog.ui.h:4
 msgid "_Start Restoring..."
 msgstr "_Start Restoringâ"
 
@@ -697,8 +896,8 @@ msgstr "Updated"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../data/ui/smart-dialog.ui.h:5 ../src/palimpsest/gduatasmartdialog.c:300
-#: ../src/palimpsest/gduatasmartdialog.c:519
+#: ../data/ui/smart-dialog.ui.h:5 ../src/disks/gduatasmartdialog.c:284
+#: ../src/disks/gduatasmartdialog.c:503
 msgid "Temperature"
 msgstr "Temperature"
 
@@ -714,58 +913,104 @@ msgstr "Self-assessment"
 msgid "Overall Assessment"
 msgstr "Overall Assessment"
 
+#: ../data/ui/smart-dialog.ui.h:9
+msgid "SMART _Attributes"
+msgstr "SMART _Attributes"
+
 #. Translators: This string is used as the column title in the treeview for the value
-#: ../data/ui/smart-dialog.ui.h:9 ../src/palimpsest/gduatasmartdialog.c:1620
+#: ../data/ui/smart-dialog.ui.h:10 ../src/disks/gduatasmartdialog.c:1491
 msgid "Value"
 msgstr "Value"
 
-#. How often the attribute is updated. The two possible values are 'Every time data is collected (online)' and 'Only during off-line activities (Not Online)'
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../data/ui/smart-dialog.ui.h:11 ../src/palimpsest/gduatasmartdialog.c:865
-msgid "Updates"
-msgstr "Updates"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../data/ui/smart-dialog.ui.h:12 ../src/palimpsest/gduatasmartdialog.c:863
+#: ../data/ui/smart-dialog.ui.h:11
 msgid "Type"
 msgstr "Type"
 
-#: ../data/ui/smart-dialog.ui.h:13
-msgid "Normalized"
-msgstr "Normalised"
-
-#: ../data/ui/smart-dialog.ui.h:14
-msgid "<b>SMART _Attributes</b>"
-msgstr "<b>SMART _Attributes</b>"
+#: ../data/ui/smart-dialog.ui.h:12
+msgid "Description"
+msgstr "Description"
 
-#: ../data/ui/smart-dialog.ui.h:15
+#: ../data/ui/smart-dialog.ui.h:13
 msgid "Short"
 msgstr "Short"
 
-#: ../data/ui/smart-dialog.ui.h:16
+#: ../data/ui/smart-dialog.ui.h:14
 msgid "Extended"
 msgstr "Extended"
 
-#: ../data/ui/smart-dialog.ui.h:17
+#: ../data/ui/smart-dialog.ui.h:15
 msgid "Conveyance"
 msgstr "Conveyance"
 
 #: ../data/ui/unlock-device-dialog.ui.h:1
-msgid "<big>Enter passphrase to unlock</big>"
-msgstr "<big>Enter passphrase to unlock</big>"
+msgid "Enter passphrase to unlock"
+msgstr "Enter passphrase to unlock"
 
 #: ../data/ui/unlock-device-dialog.ui.h:4
 msgid "_Unlock"
 msgstr "_Unlock"
 
+#: ../src/disk-image-mounter/main.c:44
+msgid "An error occurred"
+msgstr "An error occurred"
+
+#: ../src/disk-image-mounter/main.c:65
+msgid "Allow writing to the image"
+msgstr "Allow writing to the image"
+
+#: ../src/disk-image-mounter/main.c:80
+msgid "Select Disk Image(s) to Mount"
+msgstr "Select Disk Image(s) to Mount"
+
+#: ../src/disk-image-mounter/main.c:84
+msgid "_Mount"
+msgstr "_Mount"
+
+#. Add a RO check button that defaults to RO
+#: ../src/disk-image-mounter/main.c:90
+msgid "Set up _read-only mount"
+msgstr "Set up _read-only mount"
+
+#: ../src/disk-image-mounter/main.c:91
+msgid ""
+"If checked, the mount will be read-only. This is useful if you don't want "
+"the underlying disk image to be modified"
+msgstr ""
+"If ticked, the mount will be read-only. This is useful if you don't want the "
+"underlying disk image to be modified"
+
+#: ../src/disk-image-mounter/main.c:133
+#, c-format
+msgid "Error connecting to udisks daemon: %s (%s, %d)"
+msgstr "Error connecting to udisks daemon: %s (%s, %d)"
+
+#: ../src/disk-image-mounter/main.c:141
+msgid "Attach and mount one or more disk image files."
+msgstr "Attach and mount one or more disk image files."
+
+#: ../src/disk-image-mounter/main.c:189
+#, c-format
+msgid "Cannot open `%s' - maybe the volume isn't mounted?"
+msgstr "Cannot open `%s' - maybe the volume isn't mounted?"
+
+#: ../src/disk-image-mounter/main.c:196
+#, c-format
+msgid "Error opening `%s': %m"
+msgstr "Error opening `%s': %m"
+
+#: ../src/disk-image-mounter/main.c:217
+#, c-format
+msgid "Error attaching disk image: %s (%s, %d)"
+msgstr "Error attaching disk image: %s (%s, %d)"
+
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:143
+#: ../src/disks/gduatasmartdialog.c:127
 msgid "Read Error Rate"
 msgstr "Read Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:144
+#: ../src/disks/gduatasmartdialog.c:128
 msgid ""
 "Frequency of errors while reading raw data from the disk. A non-zero value "
 "indicates a problem with either the disk surface or read/write heads"
@@ -776,44 +1021,44 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:153
+#: ../src/disks/gduatasmartdialog.c:137
 msgid "Throughput Performance"
 msgstr "Throughput Performance"
 
-#: ../src/palimpsest/gduatasmartdialog.c:154
+#: ../src/disks/gduatasmartdialog.c:138
 msgid "Average efficiency of the disk"
 msgstr "Average efficiency of the disk"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:161
+#: ../src/disks/gduatasmartdialog.c:145
 msgid "Spinup Time"
 msgstr "Spin Up Time"
 
-#: ../src/palimpsest/gduatasmartdialog.c:162
+#: ../src/disks/gduatasmartdialog.c:146
 msgid "Time needed to spin up the disk"
 msgstr "Time needed to spin up the disk"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:169
+#: ../src/disks/gduatasmartdialog.c:153
 msgid "Start/Stop Count"
 msgstr "Start/Stop Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:170
+#: ../src/disks/gduatasmartdialog.c:154
 msgid "Number of spindle start/stop cycles"
 msgstr "Number of spindle start/stop cycles"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:177
+#: ../src/disks/gduatasmartdialog.c:161
 msgid "Reallocated Sector Count"
 msgstr "Reallocated Sector Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:178
+#: ../src/disks/gduatasmartdialog.c:162
 msgid ""
 "Count of remapped sectors. When the hard drive finds a read/write/"
 "verification error, it marks the sector as \"reallocated\" and transfers "
@@ -826,112 +1071,110 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:187
+#: ../src/disks/gduatasmartdialog.c:171
 msgid "Read Channel Margin"
 msgstr "Read Channel Margin"
 
-#: ../src/palimpsest/gduatasmartdialog.c:188
+#: ../src/disks/gduatasmartdialog.c:172
 msgid "Margin of a channel while reading data."
 msgstr "Margin of a channel while reading data."
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:195
+#: ../src/disks/gduatasmartdialog.c:179
 msgid "Seek Error Rate"
 msgstr "Seek Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:196
+#: ../src/disks/gduatasmartdialog.c:180
 msgid "Frequency of errors while positioning"
 msgstr "Frequency of errors while positioning"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:203
+#: ../src/disks/gduatasmartdialog.c:187
 msgid "Seek Timer Performance"
 msgstr "Seek Timer Performance"
 
-#: ../src/palimpsest/gduatasmartdialog.c:204
+#: ../src/disks/gduatasmartdialog.c:188
 msgid "Average efficiency of operations while positioning"
 msgstr "Average efficiency of operations while positioning"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:211
-#: ../src/palimpsest/gduatasmartdialog.c:536
+#: ../src/disks/gduatasmartdialog.c:195 ../src/disks/gduatasmartdialog.c:520
 msgid "Power-On Hours"
 msgstr "Power-On Hours"
 
-#: ../src/palimpsest/gduatasmartdialog.c:212
-#: ../src/palimpsest/gduatasmartdialog.c:537
+#: ../src/disks/gduatasmartdialog.c:196 ../src/disks/gduatasmartdialog.c:521
 msgid "Number of hours elapsed in the power-on state"
 msgstr "Number of hours elapsed in the power-on state"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:219
+#: ../src/disks/gduatasmartdialog.c:203
 msgid "Spinup Retry Count"
 msgstr "Spin Up Retry Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:220
+#: ../src/disks/gduatasmartdialog.c:204
 msgid "Number of retry attempts to spin up"
 msgstr "Number of retry attempts to spin up"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:227
+#: ../src/disks/gduatasmartdialog.c:211
 msgid "Calibration Retry Count"
 msgstr "Calibration Retry Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:228
+#: ../src/disks/gduatasmartdialog.c:212
 msgid "Number of attempts to calibrate the device"
 msgstr "Number of attempts to calibrate the device"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:235
+#: ../src/disks/gduatasmartdialog.c:219
 msgid "Power Cycle Count"
 msgstr "Power Cycle Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:236
+#: ../src/disks/gduatasmartdialog.c:220
 msgid "Number of power-on events"
 msgstr "Number of power-on events"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:243
+#: ../src/disks/gduatasmartdialog.c:227
 msgid "Soft read error rate"
 msgstr "Soft read error rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:245
+#: ../src/disks/gduatasmartdialog.c:229
 msgid "Frequency of errors while reading from the disk"
 msgstr "Frequency of errors while reading from the disk"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:252
+#: ../src/disks/gduatasmartdialog.c:236
 msgid "Reported Uncorrectable Errors"
 msgstr "Reported Uncorrectable Errors"
 
-#: ../src/palimpsest/gduatasmartdialog.c:253
+#: ../src/disks/gduatasmartdialog.c:237
 msgid "Number of errors that could not be recovered using hardware ECC"
 msgstr "Number of errors that could not be recovered using hardware ECC"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:260
+#: ../src/disks/gduatasmartdialog.c:244
 msgid "High Fly Writes"
 msgstr "High Fly Writes"
 
-#: ../src/palimpsest/gduatasmartdialog.c:261
+#: ../src/disks/gduatasmartdialog.c:245
 msgid ""
 "Number of times a recording head is flying outside its normal operating range"
 msgstr ""
@@ -940,73 +1183,70 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:268
+#: ../src/disks/gduatasmartdialog.c:252
 msgid "Airflow Temperature"
 msgstr "Airflow Temperature"
 
-#: ../src/palimpsest/gduatasmartdialog.c:269
+#: ../src/disks/gduatasmartdialog.c:253
 msgid "Airflow temperature of the drive"
 msgstr "Airflow temperature of the drive"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:276
-#: ../src/palimpsest/gduatasmartdialog.c:446
+#: ../src/disks/gduatasmartdialog.c:260 ../src/disks/gduatasmartdialog.c:430
 msgid "G-sense Error Rate"
 msgstr "G-sense Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:277
+#: ../src/disks/gduatasmartdialog.c:261
 msgid "Frequency of mistakes as a result of impact loads"
 msgstr "Frequency of mistakes as a result of impact loads"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:284
-#: ../src/palimpsest/gduatasmartdialog.c:503
+#: ../src/disks/gduatasmartdialog.c:268 ../src/disks/gduatasmartdialog.c:487
 msgid "Power-off Retract Count"
 msgstr "Power-off Retract Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:285
+#: ../src/disks/gduatasmartdialog.c:269
 msgid "Number of power-off or emergency retract cycles"
 msgstr "Number of power-off or emergency retract cycles"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:292
-#: ../src/palimpsest/gduatasmartdialog.c:479
+#: ../src/disks/gduatasmartdialog.c:276 ../src/disks/gduatasmartdialog.c:463
 msgid "Load/Unload Cycle Count"
 msgstr "Load/Unload Cycle Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:293
+#: ../src/disks/gduatasmartdialog.c:277
 msgid "Number of cycles into landing zone position"
 msgstr "Number of cycles into landing zone position"
 
-#: ../src/palimpsest/gduatasmartdialog.c:301
+#: ../src/disks/gduatasmartdialog.c:285
 msgid "Current internal temperature of the drive"
 msgstr "Current internal temperature of the drive"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:308
+#: ../src/disks/gduatasmartdialog.c:292
 msgid "Hardware ECC Recovered"
 msgstr "Hardware ECC Recovered"
 
-#: ../src/palimpsest/gduatasmartdialog.c:309
+#: ../src/disks/gduatasmartdialog.c:293
 msgid "Number of ECC on-the-fly errors"
 msgstr "Number of ECC on-the-fly errors"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:316
+#: ../src/disks/gduatasmartdialog.c:300
 msgid "Reallocation Count"
 msgstr "Reallocation Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:317
+#: ../src/disks/gduatasmartdialog.c:301
 msgid ""
 "Number of remapping operations. The raw value of this attribute shows the "
 "total number of (successful and unsuccessful) attempts to transfer data from "
@@ -1019,11 +1259,11 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:327
+#: ../src/disks/gduatasmartdialog.c:311
 msgid "Current Pending Sector Count"
 msgstr "Current Pending Sector Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:328
+#: ../src/disks/gduatasmartdialog.c:312
 msgid ""
 "Number of sectors waiting to be remapped. If the sector waiting to be "
 "remapped is subsequently written or read successfully, this value is "
@@ -1038,11 +1278,11 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:339
+#: ../src/disks/gduatasmartdialog.c:323
 msgid "Uncorrectable Sector Count"
 msgstr "Uncorrectable Sector Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:340
+#: ../src/disks/gduatasmartdialog.c:324
 msgid ""
 "The total number of uncorrectable errors when reading/writing a sector. A "
 "rise in the value of this attribute indicates defects of the disk surface "
@@ -1055,22 +1295,22 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:349
+#: ../src/disks/gduatasmartdialog.c:333
 msgid "UDMA CRC Error Rate"
 msgstr "UDMA CRC Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:350
+#: ../src/disks/gduatasmartdialog.c:334
 msgid "Number of CRC errors during UDMA mode"
 msgstr "Number of CRC errors during UDMA mode"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:357
+#: ../src/disks/gduatasmartdialog.c:341
 msgid "Write Error Rate"
 msgstr "Write Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:358
+#: ../src/disks/gduatasmartdialog.c:342
 msgid ""
 "Number of errors while writing to disk (or) multi-zone error rate (or) "
 "flying-height"
@@ -1081,110 +1321,110 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:365
+#: ../src/disks/gduatasmartdialog.c:349
 msgid "Soft Read Error Rate"
 msgstr "Soft Read Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:366
+#: ../src/disks/gduatasmartdialog.c:350
 msgid "Number of off-track errors"
 msgstr "Number of off-track errors"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:373
+#: ../src/disks/gduatasmartdialog.c:357
 msgid "Data Address Mark Errors"
 msgstr "Data Address Mark Errors"
 
-#: ../src/palimpsest/gduatasmartdialog.c:374
+#: ../src/disks/gduatasmartdialog.c:358
 msgid "Number of Data Address Mark (DAM) errors (or) vendor-specific"
 msgstr "Number of Data Address Mark (DAM) errors (or) vendor-specific"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:381
+#: ../src/disks/gduatasmartdialog.c:365
 msgid "Run Out Cancel"
 msgstr "Run Out Cancel"
 
-#: ../src/palimpsest/gduatasmartdialog.c:382
+#: ../src/disks/gduatasmartdialog.c:366
 msgid "Number of ECC errors"
 msgstr "Number of ECC errors"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:389
+#: ../src/disks/gduatasmartdialog.c:373
 msgid "Soft ECC correction"
 msgstr "Soft ECC correction"
 
-#: ../src/palimpsest/gduatasmartdialog.c:390
+#: ../src/disks/gduatasmartdialog.c:374
 msgid "Number of errors corrected by software ECC"
 msgstr "Number of errors corrected by software ECC"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:397
+#: ../src/disks/gduatasmartdialog.c:381
 msgid "Thermal Asperity Rate"
 msgstr "Thermal Asperity Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:398
+#: ../src/disks/gduatasmartdialog.c:382
 msgid "Number of Thermal Asperity Rate errors"
 msgstr "Number of Thermal Asperity Rate errors"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:405
+#: ../src/disks/gduatasmartdialog.c:389
 msgid "Flying Height"
 msgstr "Flying Height"
 
-#: ../src/palimpsest/gduatasmartdialog.c:406
+#: ../src/disks/gduatasmartdialog.c:390
 msgid "Height of heads above the disk surface"
 msgstr "Height of heads above the disk surface"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:413
+#: ../src/disks/gduatasmartdialog.c:397
 msgid "Spin High Current"
 msgstr "Spin High Current"
 
-#: ../src/palimpsest/gduatasmartdialog.c:414
+#: ../src/disks/gduatasmartdialog.c:398
 msgid "Amount of high current used to spin up the drive"
 msgstr "Amount of high current used to spin up the drive"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:421
+#: ../src/disks/gduatasmartdialog.c:405
 msgid "Spin Buzz"
 msgstr "Spin Buzz"
 
-#: ../src/palimpsest/gduatasmartdialog.c:422
+#: ../src/disks/gduatasmartdialog.c:406
 msgid "Number of buzz routines to spin up the drive"
 msgstr "Number of buzz routines to spin up the drive"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:429
+#: ../src/disks/gduatasmartdialog.c:413
 msgid "Offline Seek Performance"
 msgstr "Offline Seek Performance"
 
-#: ../src/palimpsest/gduatasmartdialog.c:430
+#: ../src/disks/gduatasmartdialog.c:414
 msgid "Drive's seek performance during offline operations"
 msgstr "Drive's seek performance during offline operations"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:437
+#: ../src/disks/gduatasmartdialog.c:421
 msgid "Disk Shift"
 msgstr "Disk Shift"
 
-#: ../src/palimpsest/gduatasmartdialog.c:438
+#: ../src/disks/gduatasmartdialog.c:422
 msgid ""
 "Shift of disk is possible as a result of strong shock loading in the store, "
 "as a result of falling (or) temperature"
@@ -1192,7 +1432,7 @@ msgstr ""
 "Shift of disk is possible as a result of strong shock loading in the store, "
 "as a result of falling (or) temperature"
 
-#: ../src/palimpsest/gduatasmartdialog.c:447
+#: ../src/disks/gduatasmartdialog.c:431
 msgid ""
 "Number of errors as a result of impact loads as detected by a shock sensor"
 msgstr ""
@@ -1201,22 +1441,22 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:454
+#: ../src/disks/gduatasmartdialog.c:438
 msgid "Loaded Hours"
 msgstr "Loaded Hours"
 
-#: ../src/palimpsest/gduatasmartdialog.c:455
+#: ../src/disks/gduatasmartdialog.c:439
 msgid "Number of hours in general operational state"
 msgstr "Number of hours in general operational state"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:462
+#: ../src/disks/gduatasmartdialog.c:446
 msgid "Load/Unload Retry Count"
 msgstr "Load/Unload Retry Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:463
+#: ../src/disks/gduatasmartdialog.c:447
 msgid ""
 "Loading on drive caused by numerous recurrences of operations, like reading, "
 "recording, positioning of heads, etc"
@@ -1227,67 +1467,67 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:471
+#: ../src/disks/gduatasmartdialog.c:455
 msgid "Load Friction"
 msgstr "Load Friction"
 
-#: ../src/palimpsest/gduatasmartdialog.c:472
+#: ../src/disks/gduatasmartdialog.c:456
 msgid "Load on drive caused by friction in mechanical parts of the store"
 msgstr "Load on drive caused by friction in mechanical parts of the store"
 
-#: ../src/palimpsest/gduatasmartdialog.c:480
+#: ../src/disks/gduatasmartdialog.c:464
 msgid "Total number of load cycles"
 msgstr "Total number of load cycles"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:487
+#: ../src/disks/gduatasmartdialog.c:471
 msgid "Load-in Time"
 msgstr "Load-in Time"
 
-#: ../src/palimpsest/gduatasmartdialog.c:488
+#: ../src/disks/gduatasmartdialog.c:472
 msgid "General time for loading in a drive"
 msgstr "General time for loading in a drive"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:495
+#: ../src/disks/gduatasmartdialog.c:479
 msgid "Torque Amplification Count"
 msgstr "Torque Amplification Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:496
+#: ../src/disks/gduatasmartdialog.c:480
 msgid "Quantity efforts of the rotating moment of a drive"
 msgstr "Quantity efforts of the rotating moment of a drive"
 
-#: ../src/palimpsest/gduatasmartdialog.c:504
+#: ../src/disks/gduatasmartdialog.c:488
 msgid "Number of power-off retract events"
 msgstr "Number of power-off retract events"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:511
+#: ../src/disks/gduatasmartdialog.c:495
 msgid "GMR Head Amplitude"
 msgstr "GMR Head Amplitude"
 
-#: ../src/palimpsest/gduatasmartdialog.c:512
+#: ../src/disks/gduatasmartdialog.c:496
 msgid "Amplitude of heads trembling (GMR-head) in running mode"
 msgstr "Amplitude of heads trembling (GMR-head) in running mode"
 
-#: ../src/palimpsest/gduatasmartdialog.c:520
+#: ../src/disks/gduatasmartdialog.c:504
 msgid "Temperature of the drive"
 msgstr "Temperature of the drive"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:527
+#: ../src/disks/gduatasmartdialog.c:511
 msgid "Endurance Remaining"
 msgstr "Endurance Remaining"
 
-#: ../src/palimpsest/gduatasmartdialog.c:528
+#: ../src/disks/gduatasmartdialog.c:512
 msgid ""
 "Number of physical erase cycles completed on the drive as a percentage of "
 "the maximum physical erase cycles the drive supports"
@@ -1298,22 +1538,22 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:544
+#: ../src/disks/gduatasmartdialog.c:528
 msgid "Uncorrectable ECC Count"
 msgstr "Uncorrectable ECC Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:545
+#: ../src/disks/gduatasmartdialog.c:529
 msgid "Number of uncorrectable ECC errors"
 msgstr "Number of uncorrectable ECC errors"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:552
+#: ../src/disks/gduatasmartdialog.c:536
 msgid "Good Block Rate"
 msgstr "Good Block Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:553
+#: ../src/disks/gduatasmartdialog.c:537
 msgid ""
 "Number of available reserved blocks as a percentage of the total number of "
 "reserved blocks"
@@ -1324,94 +1564,45 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:561
+#: ../src/disks/gduatasmartdialog.c:545
 msgid "Head Flying Hours"
 msgstr "Head Flying Hours"
 
-#: ../src/palimpsest/gduatasmartdialog.c:562
+#: ../src/disks/gduatasmartdialog.c:546
 msgid "Time while head is positioning"
 msgstr "Time while head is positioning"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:569
+#: ../src/disks/gduatasmartdialog.c:553
 msgid "Read Error Retry Rate"
 msgstr "Read Error Retry Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:570
+#: ../src/disks/gduatasmartdialog.c:554
 msgid "Number of errors while reading from a disk"
 msgstr "Number of errors while reading from a disk"
 
-#: ../src/palimpsest/gduatasmartdialog.c:630
-#: ../src/palimpsest/gduatasmartdialog.c:820
+#: ../src/disks/gduatasmartdialog.c:614
 #, c-format
 msgid "No description for attribute %d"
 msgstr "No description for attribute %d"
 
 #. Translators: Shown in the treeview for a failing attribute
-#: ../src/palimpsest/gduatasmartdialog.c:681
+#: ../src/disks/gduatasmartdialog.c:665
 msgid "FAILING"
 msgstr "FAILING"
 
 #. Translators: Shown in the treeview for an attribute that failed in the past
-#: ../src/palimpsest/gduatasmartdialog.c:690
+#: ../src/disks/gduatasmartdialog.c:674
 msgid "Failed in the past"
 msgstr "Failed in the past"
 
-#: ../src/palimpsest/gduatasmartdialog.c:694
+#: ../src/disks/gduatasmartdialog.c:678
 msgid "OK"
 msgstr "OK"
 
-#. Translators: Used for a time-based unit that exceed one year
-#: ../src/palimpsest/gduatasmartdialog.c:711
-#, c-format
-msgid "%.1f year"
-msgid_plural "%.1f years"
-msgstr[0] "%.1f year"
-msgstr[1] "%.1f years"
-
-#. Translators: Used for a time-based unit that exceed one day but not one year
-#: ../src/palimpsest/gduatasmartdialog.c:717
-#, c-format
-msgid "%.1f day"
-msgid_plural "%.1f days"
-msgstr[0] "%.1f days"
-msgstr[1] "%.1f days"
-
-#. Translators: Used for a time-based unit that exceed one hour but not one day
-#: ../src/palimpsest/gduatasmartdialog.c:723
-#, c-format
-msgid "%.1f hour"
-msgid_plural "%.1f hours"
-msgstr[0] "%.1f hour"
-msgstr[1] "%.1f hours"
-
-#. Translators: Used for a time-based unit that exceed one minute but not one hour
-#: ../src/palimpsest/gduatasmartdialog.c:729
-#, c-format
-msgid "%.1f minute"
-msgid_plural "%.1f minutes"
-msgstr[0] "%.1f minute"
-msgstr[1] "%.1f minutes"
-
-#. Translators: Used for a time-based unit that exceed one second but not one minute
-#: ../src/palimpsest/gduatasmartdialog.c:735
-#, c-format
-msgid "%.1f second"
-msgid_plural "%.1f seconds"
-msgstr[0] "%.1f second"
-msgstr[1] "%.1f seconds"
-
-#. Translators: Used for a time-based unit that is counted in milliseconds and doesn't exceed one second
-#: ../src/palimpsest/gduatasmartdialog.c:741
-#, c-format
-msgid "%.1f msec"
-msgid_plural "%.1f msecs"
-msgstr[0] "%.1f msec"
-msgstr[1] "%.1f msecs"
-
-#: ../src/palimpsest/gduatasmartdialog.c:764
+#: ../src/disks/gduatasmartdialog.c:705
 #, c-format
 msgid "%d sector"
 msgid_plural "%d sectors"
@@ -1425,67 +1616,33 @@ msgstr[1] "%d sectors"
 #. * The first %f is the temperature in degrees Celcius and
 #. * the second %f is the temperature in degrees Fahrenheit.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:776
-#: ../src/palimpsest/gduatasmartdialog.c:1058
-#, c-format
-msgid "%.0f C / %.0f F"
-msgstr "%.0f C/%.0f F"
-
-#. SK_SMART_ATTRIBUTE_UNIT_UNKNOWN
-#. Translators: Used in the treeview for the pretty/interpreted value of an attribute
-#. * where the value cannot be interpreted
-#: ../src/palimpsest/gduatasmartdialog.c:787
-msgid "N/A"
-msgstr "N/A"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Pre-Fail)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:831
-msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
-msgstr "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Old-Age)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:838
-msgid ""
-"Failure is a sign the disk exceeded its intended design life period (Old-Age)"
-msgstr ""
-"Failure is a sign the disk exceeded its intended design life period (Old-Age)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Online)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:846
-msgid "Every time data is collected (Online)"
-msgstr "Every time data is collected (Online)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Not Online)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:853
-msgid "Only during off-line activities (Not Online)"
-msgstr "Only during offline activities (Not Online)"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:861
-msgid "Name"
-msgstr "Name"
+#: ../src/disks/gduatasmartdialog.c:717 ../src/disks/gduatasmartdialog.c:929
+#, c-format
+msgid "%.0f C / %.0f F"
+msgstr "%.0f C/%.0f F"
 
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:867
-msgid "Description"
-msgstr "Description"
+#. SK_SMART_ATTRIBUTE_UNIT_UNKNOWN
+#. Translators: Used in the treeview for the pretty/interpreted value of an attribute
+#. * where the value cannot be interpreted
+#: ../src/disks/gduatasmartdialog.c:728
+msgid "N/A"
+msgstr "N/A"
 
-#: ../src/palimpsest/gduatasmartdialog.c:908
+#. Translators: The first %s is the pretty value (such as '300
+#. * sectors' or '2.5 years' or '53Â C / 127Â F').
+#. *
+#. * The three %d are the normalized, threshold and worst values -
+#. * these are all decimal numbers.
+#.
+#: ../src/disks/gduatasmartdialog.c:774
 #, c-format
-msgid "%d <span size=\"small\">(Worst:%d, Threshold: %d)</span>"
-msgstr "%d <span size=\"small\">(Worst:%d, Threshold: %d)</span>"
+msgid ""
+"%s <span size=\"small\">(Normalized: %d, Threshold: %d, Worst: %d)</span>"
+msgstr "%s <span size=\"small\">(Normalised: %d, Threshold: %d, Worst: %d)</span>"
 
 #. Translators: Please keep "(Pre-Fail)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:918
+#: ../src/disks/gduatasmartdialog.c:784
 msgid ""
 "Failure is a sign the disk will fail within 24 hours <span size=\"small\">"
 "(Pre-Fail)</span>"
@@ -1495,7 +1652,7 @@ msgstr ""
 
 #. Translators: Please keep "(Old-Age)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:924
+#: ../src/disks/gduatasmartdialog.c:790
 msgid ""
 "Failure is a sign the disk exceeded its intended design life period <span "
 "size=\"small\">(Old-Age)</span>"
@@ -1505,123 +1662,124 @@ msgstr ""
 
 #. Translators: Please keep "(Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:931
-msgid "Every time data is collected <span size=\"small\">(Online)</span>"
-msgstr "Every time data is collected <span size=\"small\">(Online)</span>"
+#: ../src/disks/gduatasmartdialog.c:797
+msgid ""
+"Updated every time data is collected <span size=\"small\">(Online)</span>"
+msgstr "Updated every time data is collected <span size=\"small\">(Online)</span>"
 
 #. Translators: Please keep "(Not Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:937
+#: ../src/disks/gduatasmartdialog.c:803
 msgid ""
-"Only during off-line activities <span size=\"small\">(Not Online)</span>"
+"Updated only during off-line activities <span size=\"small\">(Not Online)</"
+"span>"
 msgstr ""
-"Only during off-line activities <span size=\"small\">(Not Online)</span>"
+"Updated only during off-line activities <span size=\"small\">(Not "
+"Online)</span>"
 
-#: ../src/palimpsest/gduatasmartdialog.c:964
+#: ../src/disks/gduatasmartdialog.c:834
 msgctxt "smart-self-test-result"
 msgid "Last self-test completed successfully"
 msgstr "Last self-test completed successfully"
 
-#: ../src/palimpsest/gduatasmartdialog.c:968
+#: ../src/disks/gduatasmartdialog.c:838
 msgctxt "smart-self-test-result"
 msgid "Last self-test was aborted"
 msgstr "Last self-test was aborted"
 
-#: ../src/palimpsest/gduatasmartdialog.c:972
+#: ../src/disks/gduatasmartdialog.c:842
 msgctxt "smart-self-test-result"
 msgid "Last self-test was interrupted"
 msgstr "Last self-test was interrupted"
 
-#: ../src/palimpsest/gduatasmartdialog.c:976
+#: ../src/disks/gduatasmartdialog.c:846
 msgctxt "smart-self-test-result"
 msgid "Last self-test did not complete"
 msgstr "Last self-test did not complete"
 
-#: ../src/palimpsest/gduatasmartdialog.c:980
+#: ../src/disks/gduatasmartdialog.c:850
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed"
 msgstr "Last self-test failed"
 
 #. Translators: shown when the last self-test failed and the problem is with the electrical subsystem
-#: ../src/palimpsest/gduatasmartdialog.c:985
+#: ../src/disks/gduatasmartdialog.c:855
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (electrical)"
 msgstr "Last self-test failed (electrical)"
 
 #. Translators: shown when the last self-test failed and the problem is with the servo subsystem - see http://en.wikipedia.org/wiki/Servomechanism
-#: ../src/palimpsest/gduatasmartdialog.c:990
+#: ../src/disks/gduatasmartdialog.c:860
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (servo)"
 msgstr "Last self-test failed (servo)"
 
 #. Translators: shown when the last self-test failed and the problem is with the reading subsystem -
-#: ../src/palimpsest/gduatasmartdialog.c:995
+#: ../src/disks/gduatasmartdialog.c:865
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (read)"
 msgstr "Last self-test failed (read)"
 
 #. Translators: shown when the last self-test failed and the disk is suspected of having handling damage (e.g. physical damage to the hard disk)
-#: ../src/palimpsest/gduatasmartdialog.c:1000
+#: ../src/disks/gduatasmartdialog.c:870
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (handling)"
 msgstr "Last self-test failed (handling)"
 
 #. Translators: shown when a self-test is in progress. The first %d is the percentage of the test remaining.
-#: ../src/palimpsest/gduatasmartdialog.c:1005
+#: ../src/disks/gduatasmartdialog.c:875
 #, c-format
 msgctxt "smart-self-test-result"
 msgid "Self-test in progress â %d%% remaining"
 msgstr "Self-test in progress â %d%% remaining"
 
 #. Translators: Shown when a self-test is not unknown. The %s is the result-code from the API code.
-#: ../src/palimpsest/gduatasmartdialog.c:1012
+#: ../src/disks/gduatasmartdialog.c:882
 #, c-format
 msgctxt "smart-self-test-result"
 msgid "Unknown (%s)"
 msgstr "Unknown (%s)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1034
+#: ../src/disks/gduatasmartdialog.c:905
 #, c-format
 msgid "%s ago"
 msgstr "%s ago"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1091
+#: ../src/disks/gduatasmartdialog.c:963
 msgid "SMART is not supported"
 msgstr "SMART is not supported"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1097
+#: ../src/disks/gduatasmartdialog.c:969
 msgid "SMART is not enabled"
 msgstr "SMART is not enabled"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1109
-#, c-format
-msgid "Self-test in progress â %d%% remaining"
-msgstr "Self-test in progress â %d%% remaining"
+#: ../src/disks/gduatasmartdialog.c:981
+msgid "Self-test in progress"
+msgstr "Self-test in progress"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1123
-#: ../src/palimpsest/gduatasmartdialog.c:1132
+#: ../src/disks/gduatasmartdialog.c:994 ../src/disks/gduatasmartdialog.c:1003
 msgid "DISK IS LIKELY TO FAIL SOON"
 msgstr "DISK IS LIKELY TO FAIL SOON"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1155
+#: ../src/disks/gduatasmartdialog.c:1026
 msgid "SELF-TEST FAILED"
 msgstr "SELF-TEST FAILED"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1164
+#: ../src/disks/gduatasmartdialog.c:1035
 #, c-format
 msgid "Disk is OK, one failing attribute is failing"
 msgid_plural "Disk is OK, %d attributes are failing"
 msgstr[0] "Disk is OK, one failing attribute is failing"
 msgstr[1] "Disk is OK, %d attributes are failing"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1175
+#: ../src/disks/gduatasmartdialog.c:1046
 #, c-format
 msgid "Disk is OK, one bad sector"
 msgid_plural "Disk is OK, %d bad sectors"
 msgstr[0] "Disk is OK, one bad sector"
 msgstr[1] "Disk is OK, %d bad sectors"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1186
+#: ../src/disks/gduatasmartdialog.c:1057
 #, c-format
 msgid "Disk is OK, one attribute failed in the past"
 msgid_plural "Disk is OK, %d attributes failed in the past"
@@ -1629,7 +1787,7 @@ msgstr[0] "Disk is OK, one attribute failed in the past"
 msgstr[1] "Disk is OK, %d attributes failed in the past"
 
 #. Otherwise, it's all honky dory
-#: ../src/palimpsest/gduatasmartdialog.c:1195
+#: ../src/disks/gduatasmartdialog.c:1066
 msgid "Disk is OK"
 msgstr "Disk is OK"
 
@@ -1637,61 +1795,216 @@ msgstr "Disk is OK"
 #. * The first %s is the status of the drive.
 #. * The second %s is the temperature of the drive.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:1209
+#: ../src/disks/gduatasmartdialog.c:1080
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1364
+#: ../src/disks/gduatasmartdialog.c:1235
 msgid "Threshold exceeded"
 msgstr "Threshold exceeded"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1369
+#: ../src/disks/gduatasmartdialog.c:1240
 msgid "Threshold not exceeded"
 msgstr "Threshold not exceeded"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1428
+#: ../src/disks/gduatasmartdialog.c:1299
 msgid "Error refreshing SMART data"
 msgstr "Error refreshing SMART data"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1460
+#: ../src/disks/gduatasmartdialog.c:1331
 msgid "Error aborting SMART self-test"
 msgstr "Error aborting SMART self-test"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1479
+#: ../src/disks/gduatasmartdialog.c:1350
 msgid "Error starting SMART self-test"
 msgstr "Error starting SMART self-test"
 
 #. Translators: This string is used as the column title in the treeview for the Attribute ID (0-255)
-#: ../src/palimpsest/gduatasmartdialog.c:1594
+#: ../src/disks/gduatasmartdialog.c:1465
 msgid "ID"
 msgstr "ID"
 
 #. Translators: This string is used as the column title in the treeview for the attribute name and description
-#: ../src/palimpsest/gduatasmartdialog.c:1606
+#: ../src/disks/gduatasmartdialog.c:1477
 msgid "Attribute"
 msgstr "Attribute"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:171
+#. Translators: This is used in the benchmark graph - %d is megabytes per second
+#: ../src/disks/gdubenchmarkdialog.c:327
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%d MB/s"
+msgstr "%d MB/s"
+
+#. Translators: This is used in the benchmark graph - %g is number of milliseconds
+#: ../src/disks/gdubenchmarkdialog.c:332
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%3g ms"
+msgstr "%3g ms"
+
+#. Translators: %s is the formatted size, e.g. "42 MB" and the trailing "/s" means per second
+#: ../src/disks/gdubenchmarkdialog.c:640
+#, c-format
+msgctxt "benchmark-transfer-rate"
+msgid "%s/s"
+msgstr "%s/s"
+
+#: ../src/disks/gdubenchmarkdialog.c:655 ../src/disks/gdubenchmarkdialog.c:954
+#, c-format
+msgid "%d sample"
+msgid_plural "%d samples"
+msgstr[0] "%d sample"
+msgstr[1] "%d samples"
+
+#. Translators: The first %s is the date and time the benchmark took place in the preferred
+#. * format for the locale (e.g. "%c" for strftime()/g_date_time_format()), for example
+#. * "Tue 12 Jun 2012 03:57:08 PM EDT". The second %s is how long ago that is from right
+#. * now, for example "3 days" or "2 hours" or "12 minutes".
+#.
+#: ../src/disks/gdubenchmarkdialog.c:696
+#, c-format
+msgctxt "benchmark-updated"
+msgid "%s (%s ago)"
+msgstr "%s (%s ago)"
+
+#: ../src/disks/gdubenchmarkdialog.c:708
+msgctxt "benchmark-updated"
+msgid "No benchmark data available"
+msgstr "No benchmark data available"
+
+#: ../src/disks/gdubenchmarkdialog.c:713
+msgctxt "benchmark-updated"
+msgid "Opening Device..."
+msgstr "Opening Deviceâ"
+
+#: ../src/disks/gdubenchmarkdialog.c:717
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring transfer rate (%2.1f%% complete)..."
+msgstr "Measuring transfer rate (%2.1f%% complete)â"
+
+#: ../src/disks/gdubenchmarkdialog.c:724
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring access time (%2.1f%% complete)..."
+msgstr "Measuring access time (%2.1f%% complete)â"
+
+#: ../src/disks/gdubenchmarkdialog.c:840
+msgctxt "benchmarking"
+msgid "An error occurred"
+msgstr "An error occurred"
+
+#. Translators: The first %s is the partition size (e.g. "10.0 GB") and the two
+#. * following %s are make/model (e.g. "ST 3160A") and description (e.g. "60 GB Hard Disk")
+#.
+#: ../src/disks/gdubenchmarkdialog.c:876
+#, c-format
+msgctxt "benchmark-drive-name"
+msgid "%s partition on %s (%s)"
+msgstr "%s partition on %s (%s)"
+
+#. Translators: The first %s is the make/model (e.g. "ST 3160A"), the second %s is
+#. * the description (e.g. "60 GB Hard Disk")
+#.
+#: ../src/disks/gdubenchmarkdialog.c:886
+#, c-format
+msgctxt "benchmark-drive-name"
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#. Translators: %d is number of milliseconds and msec means "milli-second"
+#: ../src/disks/gdubenchmarkdialog.c:952
+#, c-format
+msgctxt "benchmark-access-time"
+msgid "%.2f msec"
+msgstr "%.2f msec"
+
+#: ../src/disks/gdubenchmarkdialog.c:1264
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting size of device: %m"
+msgstr "Error getting size of device: %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1274
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting page size: %m\n"
+msgstr "Error getting page size: %m\n"
+
+#: ../src/disks/gdubenchmarkdialog.c:1307
+#: ../src/disks/gdubenchmarkdialog.c:1326
+#: ../src/disks/gdubenchmarkdialog.c:1362
+#: ../src/disks/gdubenchmarkdialog.c:1381
+#, c-format
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld"
+msgstr "Error seeking to offset %lld"
+
+#: ../src/disks/gdubenchmarkdialog.c:1316
+#: ../src/disks/gdubenchmarkdialog.c:1371
+#, c-format
+msgctxt "benchmarking"
+msgid "Error pre-reading %lld bytes from offset %lld"
+msgstr "Error pre-reading %lld bytes from offset %lld"
+
+#: ../src/disks/gdubenchmarkdialog.c:1337
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %d MB from offset %lld"
+msgstr "Error reading %d MB from offset %lld"
+
+#: ../src/disks/gdubenchmarkdialog.c:1392
+#, c-format
+msgctxt "benchmarking"
+msgid "Error writing %lld bytes at offset %lld: %m"
+msgstr "Error writing %lld bytes at offset %lld: %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1402
+#, c-format
+msgctxt "benchmarking"
+msgid "Expected to write %lld bytes, only wrote %lld: %m"
+msgstr "Expected to write %lld bytes, only wrote %lld: %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1412
+#, c-format
+msgctxt "benchmarking"
+msgid "Error syncing (at offset %lld): %m"
+msgstr "Error syncing (at offset %lld): %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1452
+#, c-format
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld: %m"
+msgstr "Error seeking to offset %lld: %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1464
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %lld bytes from offset %lld"
+msgstr "Error reading %lld bytes from offset %lld"
+
+#: ../src/disks/gduchangepassphrasedialog.c:157
 msgid "Error updating /etc/crypttab"
 msgstr "Error updating /etc/crypttab"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:190
+#: ../src/disks/gduchangepassphrasedialog.c:176
 msgid "Error changing passphrase"
 msgstr "Error changing passphrase"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:277
-#: ../src/palimpsest/gducrypttabdialog.c:424
+#: ../src/disks/gduchangepassphrasedialog.c:263
+#: ../src/disks/gducrypttabdialog.c:408
 msgid "Error retrieving configuration data"
 msgstr "Error retrieving configuration data"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:303
+#: ../src/disks/gduchangepassphrasedialog.c:289
 msgid "/etc/crypttab configuration data is malformed"
 msgstr "/etc/crypttab configuration data is malformed"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:336
+#: ../src/disks/gduchangepassphrasedialog.c:322
 msgid ""
 "Changing the passphrase for this device, will also update the passphrase "
 "referenced by the <i>/etc/crypttab</i> file"
@@ -1699,8 +2012,8 @@ msgstr ""
 "Changing the passphrase for this device, will also update the passphrase "
 "referenced by the <i>/etc/crypttab</i> file"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:355
-#: ../src/palimpsest/gducreatefilesystemwidget.c:503
+#: ../src/disks/gduchangepassphrasedialog.c:341
+#: ../src/disks/gducreatefilesystemwidget.c:540
 msgid "The strength of the passphrase"
 msgstr "The strength of the passphrase"
 
@@ -1708,155 +2021,197 @@ msgstr "The strength of the passphrase"
 #. *              The first %s is a name for the disk (e.g. 'sdb').
 #. *              The second %s is today's date and time, e.g. "March 2, 1976 6:25AM".
 #.
-#: ../src/palimpsest/gducreatediskimagedialog.c:196
+#: ../src/disks/gducreatediskimagedialog.c:212
 #, c-format
 msgid "Disk Image of %s (%s).img"
 msgstr "Disk Image of %s (%s).img"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:233
-#: ../src/palimpsest/gdurestorediskimagedialog.c:274
-msgid "Error writing to backup image"
-msgstr "Error writing to backup image"
+#: ../src/disks/gducreatediskimagedialog.c:251
+msgid "Error writing to image"
+msgstr "Error writing to image"
+
+#. Translators: string used for conveying progress of copy operation.
+#. * The first two %s are strings with the amount of bytes (ex. "3.4 MB" and "300 MB").
+#. * The third %s is the estimated amount of time remaining (ex. "1 minute", "5 minutes" or "Less than a minute").
+#. * The fourth %s is the average amount of bytes transfered per second (ex. "8.9 MB").
+#.
+#: ../src/disks/gducreatediskimagedialog.c:279
+#: ../src/disks/gdurestorediskimagedialog.c:319
+#, c-format
+msgid "%s of %s copied â %s remaining (%s/sec)"
+msgstr "%s of %s copied â %s remaining (%s/sec)"
+
+#. Translators: string used for convey progress of a copy operation where we don't know time remaining / speed.
+#. * The first two %s are strings with the amount of bytes (ex. "3.4 MB" and "300 MB").
+#.
+#: ../src/disks/gducreatediskimagedialog.c:292
+#: ../src/disks/gdurestorediskimagedialog.c:332
+#, c-format
+msgid "%s of %s copied"
+msgstr "%s of %s copied"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:313
-#: ../src/palimpsest/gdurestorediskimagedialog.c:353
+#: ../src/disks/gducreatediskimagedialog.c:341
+#: ../src/disks/gdurestorediskimagedialog.c:380
 msgid "Error reading from offset %"
 msgstr "Error reading from offset %"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:381
-#: ../src/palimpsest/gdurestorediskimagedialog.c:541
-msgid "Error opening device"
-msgstr "Error opening device"
-
-#: ../src/palimpsest/gducreatediskimagedialog.c:396
-#: ../src/palimpsest/gdurestorediskimagedialog.c:557
+#: ../src/disks/gducreatediskimagedialog.c:404
+#: ../src/disks/gdurestorediskimagedialog.c:600
 msgid "Error determining size of device"
 msgstr "Error determining size of device"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:446
+#: ../src/disks/gducreatediskimagedialog.c:442
+#: ../src/disks/gdurestorediskimagedialog.c:585
+msgid "Error opening device"
+msgstr "Error opening device"
+
+#: ../src/disks/gducreatediskimagedialog.c:488
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "A file named \"%s\" already exists.  Do you want to replace it?"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:449
+#: ../src/disks/gducreatediskimagedialog.c:491
 #, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:453
+#: ../src/disks/gducreatediskimagedialog.c:495
 msgid "_Replace"
 msgstr "_Replace"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:495
+#: ../src/disks/gducreatediskimagedialog.c:538
 msgid "Error opening file for writing"
 msgstr "Error opening file for writing"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:564
+#: ../src/disks/gducreatediskimagedialog.c:589
+msgid "Copying data from device..."
+msgstr "Copying data from deviceâ"
+
+#. Translators: This is the window title for the non-modal "Create Disk Image" dialog. The %s is the device.
+#: ../src/disks/gducreatediskimagedialog.c:637
 #, c-format
-msgid "Copying data from device <i>%s</i>..."
-msgstr "Copying data from device <i>%s</i>â"
+msgid "Create Disk Image (%s)"
+msgstr "Create Disk Image (%s)"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:388
-#: ../src/palimpsest/gduformatdiskdialog.c:130
+#: ../src/disks/gducreatefilesystemwidget.c:379
+#: ../src/disks/gduformatdiskdialog.c:254
 msgid "Compatible with all systems and devices"
 msgstr "Compatible with all systems and devices"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:389
+#: ../src/disks/gducreatefilesystemwidget.c:380
 msgid "FAT"
 msgstr "FAT"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:394
+#: ../src/disks/gducreatefilesystemwidget.c:385
 msgid "Compatible with most systems"
 msgstr "Compatible with most systems"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:395
+#: ../src/disks/gducreatefilesystemwidget.c:386
 msgid "NTFS"
 msgstr "NTFS"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:400
+#: ../src/disks/gducreatefilesystemwidget.c:391
 msgid "Compatible with Linux systems"
 msgstr "Compatible with Linux systems"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:401
+#: ../src/disks/gducreatefilesystemwidget.c:392
 msgid "Ext4"
 msgstr "Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:406
+#: ../src/disks/gducreatefilesystemwidget.c:397
 msgid "Encrypted, compatible with Linux systems"
 msgstr "Encrypted, compatible with Linux systems"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:407
+#: ../src/disks/gducreatefilesystemwidget.c:398
 msgid "LUKS + Ext4"
 msgstr "LUKS + Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:412
+#: ../src/disks/gducreatefilesystemwidget.c:403
 msgid "Custom"
 msgstr "Custom"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:413
+#: ../src/disks/gducreatefilesystemwidget.c:404
 msgid "Enter filesystem type"
 msgstr "Enter filesystem type"
 
 #. Translators: this is the default name for the filesystem
-#: ../src/palimpsest/gducreatefilesystemwidget.c:456
+#: ../src/disks/gducreatefilesystemwidget.c:450
 msgid "New Volume"
 msgstr "New Volume"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:215
+#: ../src/disks/gducreatefilesystemwidget.c:489
+#: ../src/disks/gduformatdiskdialog.c:151
+msgid "Don't overwrite existing data"
+msgstr "Don't overwrite existing data"
+
+#: ../src/disks/gducreatefilesystemwidget.c:490
+#: ../src/disks/gduformatdiskdialog.c:152
+msgid "Quick"
+msgstr "Quick"
+
+#: ../src/disks/gducreatefilesystemwidget.c:497
+#: ../src/disks/gduformatdiskdialog.c:162
+msgid "Overwrite existing data with zeroes"
+msgstr "Overwrite existing data with zeroes"
+
+#: ../src/disks/gducreatefilesystemwidget.c:498
+#: ../src/disks/gduformatdiskdialog.c:163
+msgid "Slow"
+msgstr "Slow"
+
+#: ../src/disks/gducreatepartitiondialog.c:201
 msgid "Error formatting partition"
 msgstr "Error formatting partition"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:242
+#: ../src/disks/gducreatepartitiondialog.c:229
 msgid "Error creating partition"
 msgstr "Error creating partition"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:326
+#: ../src/disks/gducreatepartitiondialog.c:317
 msgid "Extended partition"
 msgstr "Extended partition"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:327
+#: ../src/disks/gducreatepartitiondialog.c:318
 msgid "For logical partitions"
 msgstr "For logical partitions"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:340
+#: ../src/disks/gducreatepartitiondialog.c:331
 msgid ""
 "Cannot create a new partition. There are already four primary partitions."
 msgstr ""
 "Cannot create a new partition. There are already four primary partitions."
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:344
+#: ../src/disks/gducreatepartitiondialog.c:335
 msgid "This is the last primary partition that can be created."
 msgstr "This is the last primary partition that can be created."
 
-#: ../src/palimpsest/gducrypttabdialog.c:122
-#: ../src/palimpsest/gducrypttabdialog.c:142
+#: ../src/disks/gducrypttabdialog.c:108 ../src/disks/gducrypttabdialog.c:128
 msgid "Will be created"
 msgstr "Will be created"
 
-#: ../src/palimpsest/gducrypttabdialog.c:124
-#: ../src/palimpsest/gducrypttabdialog.c:149
+#: ../src/disks/gducrypttabdialog.c:110 ../src/disks/gducrypttabdialog.c:135
 msgid "None"
 msgstr "None"
 
-#: ../src/palimpsest/gducrypttabdialog.c:151
+#: ../src/disks/gducrypttabdialog.c:137
 msgid "Will be deleted"
 msgstr "Will be deleted"
 
-#: ../src/palimpsest/gducrypttabdialog.c:278
+#: ../src/disks/gducrypttabdialog.c:263
 msgid "Error removing /etc/crypttab entry"
 msgstr "Error removing /etc/crypttab entry"
 
-#: ../src/palimpsest/gducrypttabdialog.c:363
+#: ../src/disks/gducrypttabdialog.c:347
 msgid "Error adding /etc/crypttab entry"
 msgstr "Error adding /etc/crypttab entry"
 
-#: ../src/palimpsest/gducrypttabdialog.c:386
+#: ../src/disks/gducrypttabdialog.c:370
 msgid "Error updating /etc/crypttab entry"
 msgstr "Error updating /etc/crypttab entry"
 
-#: ../src/palimpsest/gducrypttabdialog.c:509
+#: ../src/disks/gducrypttabdialog.c:493
 msgid ""
 "Only the passphrase referenced by the <i>/etc/crypttab</i> file will be "
 "changed. To change the on-disk passphrase, use <i>Change Passphrase...</i>"
@@ -1864,16 +2219,16 @@ msgstr ""
 "Only the passphrase referenced by the <i>/etc/crypttab</i> file will be "
 "changed. To change the on-disk passphrase, use <i>Change Passphraseâ</i>"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:410
+#: ../src/disks/gdudevicetreemodel.c:533
 msgid "Disk Drives"
 msgstr "Disk Drives"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:820
+#: ../src/disks/gdudevicetreemodel.c:942
 msgid "Other Devices"
 msgstr "Other Devices"
 
 #. Translators: This is for a /dev/loop device - %s is the size of the device e.g. "230 MB".
-#: ../src/palimpsest/gdudevicetreemodel.c:925
+#: ../src/disks/gdudevicetreemodel.c:1047
 #, c-format
 msgid "%s Loop Device"
 msgstr "%s Loop Device"
@@ -1881,220 +2236,379 @@ msgstr "%s Loop Device"
 #. Translators: This is for a block device which we failed to categorize  - %s is
 #. * the size of the device e.g. "230 MB".
 #.
-#: ../src/palimpsest/gdudevicetreemodel.c:946
+#: ../src/disks/gdudevicetreemodel.c:1068
 #, c-format
 msgid "%s Block Device"
 msgstr "%s Block Device"
 
-#: ../src/palimpsest/gdufilesystemdialog.c:74
+#: ../src/disks/gdudisksettingsdialog.c:264
+msgctxt "standby-value"
+msgid "Never"
+msgstr "Never"
+
+#: ../src/disks/gdudisksettingsdialog.c:283
+msgctxt "standby-value"
+msgid "Vendor-defined"
+msgstr "Vendor-defined"
+
+#: ../src/disks/gdudisksettingsdialog.c:287
+msgctxt "standby-value"
+msgid "Reserved"
+msgstr "Reserved"
+
+#: ../src/disks/gdudisksettingsdialog.c:308
+msgctxt "apm-level"
+msgid "255 (Disabled)"
+msgstr "255 (Disabled)"
+
+#: ../src/disks/gdudisksettingsdialog.c:312
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down permitted)"
+msgstr "%d (Spin-down permitted)"
+
+#: ../src/disks/gdudisksettingsdialog.c:316
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down not permitted)"
+msgstr "%d (Spin-down not permitted)"
+
+#: ../src/disks/gdudisksettingsdialog.c:331
+msgctxt "aam-level"
+msgid "0 (Disabled)"
+msgstr "0 (Disabled)"
+
+#: ../src/disks/gdudisksettingsdialog.c:360
+msgid "Error setting configuration"
+msgstr "Error setting configuration"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:390
+msgid "Never"
+msgstr "Never"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:392
+msgid "5 minutes"
+msgstr "5 minutes"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:394
+msgid "10 minutes"
+msgstr "10 minutes"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:396
+msgid "15 minutes"
+msgstr "15 minutes"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:398
+msgid "3 hours"
+msgstr "3 hours"
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:402
+msgid "Save Power"
+msgstr "Save Power"
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible. The left arrow ("â") is to signify that the left part of the scale offers spindown. In RTL locales, please use a right arrow ("â") instead.
+#: ../src/disks/gdudisksettingsdialog.c:404
+msgid "â Spindown"
+msgstr "â Spindown"
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:406
+msgid "Perform Better"
+msgstr "Perform Better"
+
+#. Translators: This is a mark on the AAM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:410
+msgid "Quiet (Slow)"
+msgstr "Quiet (Slow)"
+
+#. Translators: This is a mark on the AAM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:412
+msgid "Loud (Fast)"
+msgstr "Loud (Fast)"
+
+#: ../src/disks/gdufilesystemdialog.c:60
 msgid "Error setting label"
 msgstr "Error setting label"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:131
+#. Translators: Used to convey that something takes at least
+#. * some specificed duration but may take longer. The %s is a
+#. * time duration e.g. "8 hours and 28 minutes"
+#.
+#: ../src/disks/gduformatdiskdialog.c:105
+#, c-format
+msgid "At least %s"
+msgstr "At least %s"
+
+#. Translators: Used to convey that something takes
+#. * approximately some specificed duration. The %s is a time
+#. * duration e.g. "2 hours and 2 minutes"
+#.
+#: ../src/disks/gduformatdiskdialog.c:116
+#, c-format
+msgid "Approximately %s"
+msgstr "Approximately %s"
+
+#: ../src/disks/gduformatdiskdialog.c:195
+msgid "ATA Secure Erase"
+msgstr "ATA Secure Erase"
+
+#: ../src/disks/gduformatdiskdialog.c:210
+msgid "ATA Enhanced Secure Erase"
+msgstr "ATA Enhanced Secure Erase"
+
+#: ../src/disks/gduformatdiskdialog.c:255
 msgid "MBR / DOS"
 msgstr "MBR / DOS"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:138
+#: ../src/disks/gduformatdiskdialog.c:265
 msgid "Compatible with modern systems and hard disks > 2TB"
 msgstr "Compatible with modern systems and hard disks > 2TB"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:139
+#: ../src/disks/gduformatdiskdialog.c:266
 msgid "GPT"
 msgstr "GPT"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:151
+#: ../src/disks/gduformatdiskdialog.c:283
 msgid "No partitioning"
 msgstr "No partitioning"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:152
+#: ../src/disks/gduformatdiskdialog.c:284
 msgid "Empty"
 msgstr "Empty"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:186
+#: ../src/disks/gduformatdiskdialog.c:328
 msgid "Error formatting disk"
 msgstr "Error formatting disk"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:231
+#: ../src/disks/gduformatdiskdialog.c:385
 msgid "Are you sure you want to format the disk?"
 msgstr "Are you sure you want to format the disk?"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:232
-#: ../src/palimpsest/gduformatvolumedialog.c:158
-msgid "All data on the volume will be lost"
-msgstr "All data on the volume will be lost"
+#. Translators: warning used for quick format
+#: ../src/disks/gduformatdiskdialog.c:389
+msgid ""
+"All data on the disk will be lost but may still be recoverable by data "
+"recovery services"
+msgstr ""
+"All data on the disk will be lost but may still be recoverable by data "
+"recovery services"
+
+#: ../src/disks/gduformatdiskdialog.c:391
+#: ../src/disks/gduformatvolumedialog.c:153
+msgid ""
+"<b>Tip</b>: If you are planning to recycle, sell or give away your old "
+"computer or disk, you should use a more thorough erase type to keep your "
+"private information from falling into the wrong hands"
+msgstr ""
+"<b>Tip</b>: If you are planning to recycle, sell or give away your old "
+"computer or disk, you should use a more thorough erase type to keep your "
+"private information from falling into the wrong hands"
+
+#. Translators: warning used when overwriting data
+#: ../src/disks/gduformatdiskdialog.c:396
+msgid ""
+"All data on the disk will be overwritten and will likely not be recoverable "
+"by data recovery services"
+msgstr ""
+"All data on the disk will be overwritten and will likely not be recoverable "
+"by data recovery services"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:233
-#: ../src/palimpsest/gduformatvolumedialog.c:159
+#: ../src/disks/gduformatdiskdialog.c:404
+msgid ""
+"<b>WARNING</b>: The Secure Erase command may take a very long time to "
+"complete, can't be canceled and may not work properly with some hardware. In "
+"the worst case, your drive may be rendered unusable or your system may crash "
+"or lock up. Before proceeding, please read the article about <a "
+"href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ATA Secure "
+"Erase</a> and make sure you understand the risks"
+msgstr ""
+"<b>WARNING</b>: The Secure Erase command may take a very long time to "
+"complete, can't be cancelled and may not work properly with some hardware. "
+"In the worst case, your drive may be rendered unusable or your system may "
+"crash or lock up. Before proceeding, please read the article about <a "
+"href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ATA Secure "
+"Erase</a> and make sure you understand the risks"
+
+#: ../src/disks/gduformatdiskdialog.c:411
+#: ../src/disks/gduformatvolumedialog.c:164
 msgid "_Format"
 msgstr "_Format"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:100
+#: ../src/disks/gduformatvolumedialog.c:86
 msgid "Error formatting volume"
 msgstr "Error formatting volume"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:157
+#: ../src/disks/gduformatvolumedialog.c:147
 msgid "Are you sure you want to format the volume?"
 msgstr "Are you sure you want to format the volume?"
 
-#: ../src/palimpsest/gdufstabdialog.c:166
+#. Translators: warning used for quick format of the volume
+#: ../src/disks/gduformatvolumedialog.c:151
+msgid ""
+"All data on the volume will be lost but may still be recoverable by data "
+"recovery services"
+msgstr ""
+"All data on the volume will be lost but may still be recoverable by data "
+"recovery services"
+
+#. Translators: warning used when overwriting data of the volume
+#: ../src/disks/gduformatvolumedialog.c:158
+msgid ""
+"All data on the volume will be overwritten and will likely not be "
+"recoverable by data recovery services"
+msgstr ""
+"All data on the volume will be overwritten and will likely not be "
+"recoverable by data recovery services"
+
+#: ../src/disks/gdufstabdialog.c:152
 #, c-format
 msgid "Matches partition %d of the device with the given vital product data"
 msgstr "Matches partition %d of the device with the given vital product data"
 
-#: ../src/palimpsest/gdufstabdialog.c:169
+#: ../src/disks/gdufstabdialog.c:155
 msgid "Matches the whole disk of the device with the given vital product data"
 msgstr "Matches the whole disk of the device with the given vital product data"
 
-#: ../src/palimpsest/gdufstabdialog.c:174
+#: ../src/disks/gdufstabdialog.c:160
 #, c-format
 msgid ""
 "Matches partition %d of any device connected at the given port or address"
 msgstr ""
 "Matches partition %d of any device connected at the given port or address"
 
-#: ../src/palimpsest/gdufstabdialog.c:177
+#: ../src/disks/gdufstabdialog.c:163
 msgid ""
 "Matches the whole disk of any device connected at the given port or address"
 msgstr ""
 "Matches the whole disk of any device connected at the given port or address"
 
-#: ../src/palimpsest/gdufstabdialog.c:181
+#: ../src/disks/gdufstabdialog.c:167
 msgid "Matches any device with the given label"
 msgstr "Matches any device with the given label"
 
-#: ../src/palimpsest/gdufstabdialog.c:185
+#: ../src/disks/gdufstabdialog.c:171
 msgid "Matches the device with the given UUID"
 msgstr "Matches the device with the given UUID"
 
-#: ../src/palimpsest/gdufstabdialog.c:189
+#: ../src/disks/gdufstabdialog.c:175
 msgid "Matches the given device"
 msgstr "Matches the given device"
 
-#: ../src/palimpsest/gdufstabdialog.c:473
+#: ../src/disks/gdufstabdialog.c:459
 msgid "The system may not work correctly if this entry is modified or removed."
 msgstr ""
 "The system may not work correctly if this entry is modified or removed."
 
-#: ../src/palimpsest/gdufstabdialog.c:532
+#: ../src/disks/gdufstabdialog.c:518
 msgid "Error removing old /etc/fstab entry"
 msgstr "Error removing old /etc/fstab entry"
 
-#: ../src/palimpsest/gdufstabdialog.c:588
+#: ../src/disks/gdufstabdialog.c:574
 msgid "Error adding new /etc/fstab entry"
 msgstr "Error adding new /etc/fstab entry"
 
-#: ../src/palimpsest/gdufstabdialog.c:612
+#: ../src/disks/gdufstabdialog.c:598
 msgid "Error updating /etc/fstab entry"
 msgstr "Error updating /etc/fstab entry"
 
-#: ../src/palimpsest/gdupartitiondialog.c:369
+#: ../src/disks/gdupartitiondialog.c:355
 msgid "Error setting partition type"
 msgstr "Error setting partition type"
 
-#: ../src/palimpsest/gdupartitiondialog.c:383
+#: ../src/disks/gdupartitiondialog.c:369
 msgid "Error setting partition name"
 msgstr "Error setting partition name"
 
-#: ../src/palimpsest/gdupartitiondialog.c:397
+#: ../src/disks/gdupartitiondialog.c:383
 msgid "Error setting partition flags"
 msgstr "Error setting partition flags"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:169
+#: ../src/disks/gdupasswordstrengthwidget.c:126
+msgctxt "Password strength"
 msgid "Weak"
 msgstr "Weak"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:170
+#: ../src/disks/gdupasswordstrengthwidget.c:127
+msgctxt "Password strength"
 msgid "Fair"
 msgstr "Fair"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:171
+#: ../src/disks/gdupasswordstrengthwidget.c:128
+msgctxt "Password strength"
 msgid "Good"
 msgstr "Good"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:172
+#: ../src/disks/gdupasswordstrengthwidget.c:129
+msgctxt "Password strength"
 msgid "Strong"
 msgstr "Strong"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:167
+#: ../src/disks/gdurestorediskimagedialog.c:126
+msgid "Error rescanning device"
+msgstr "Error rescanning device"
+
+#: ../src/disks/gdurestorediskimagedialog.c:185
 msgid "Cannot restore image of size 0"
 msgstr "Cannot restore image of size 0"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:176
+#: ../src/disks/gdurestorediskimagedialog.c:194
 #, c-format
 msgid "The selected image is %s smaller than the device"
 msgstr "The selected image is %s smaller than the device"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:185
+#: ../src/disks/gdurestorediskimagedialog.c:203
 #, c-format
 msgid "The selected image is %s bigger than the device"
 msgstr "The selected image is %s bigger than the device"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:416
+#: ../src/disks/gdurestorediskimagedialog.c:292
+msgid "Error writing to device"
+msgstr "Error writing to device"
+
+#: ../src/disks/gdurestorediskimagedialog.c:443
 msgid "Error opening file for reading"
 msgstr "Error opening file for reading"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:430
+#: ../src/disks/gdurestorediskimagedialog.c:457
 msgid "Error determing size of file"
 msgstr "Error determining size of file"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:495
+#: ../src/disks/gdurestorediskimagedialog.c:487
 msgid "Are you sure you want to write the disk image to the device?"
 msgstr "Are you sure you want to write the disk image to the device?"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:496
+#: ../src/disks/gdurestorediskimagedialog.c:488
 msgid "All existing data will be lost"
 msgstr "All existing data will be lost"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:497
+#: ../src/disks/gdurestorediskimagedialog.c:489
 msgid "_Restore"
 msgstr "_Restore"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:500
+#. Translators: This is the window title for the non-modal "Restore Disk Image" dialog. The %s is the device.
+#: ../src/disks/gdurestorediskimagedialog.c:551
 #, c-format
-msgid "Copying data to device <i>%s</i>..."
-msgstr "Copying data to device <i>%s</i>â"
+msgid "Restore Disk Image (%s)"
+msgstr "Restore Disk Image (%s)"
 
-#: ../src/palimpsest/gduunlockdialog.c:50
+#: ../src/disks/gduunlockdialog.c:86
 msgid "Error unlocking encrypted device"
 msgstr "Error unlocking encrypted device"
 
-#: ../src/palimpsest/gduutils.c:81
-msgid "All Files"
-msgstr "All Files"
-
-#: ../src/palimpsest/gduutils.c:85
-msgid "Disk Images (*.img, *.iso)"
-msgstr "Disk Images (*.img, *.iso)"
-
-#: ../src/palimpsest/gduutils.c:105
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d second"
-msgstr[1] "%d seconds"
-
-#: ../src/palimpsest/gduutils.c:112
-msgid "Less than a minute"
-msgstr "Less than a minute"
-
-#: ../src/palimpsest/gduutils.c:118
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d minute"
-msgstr[1] "%d minutes"
-
-#: ../src/palimpsest/gduutils.c:126
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d hour"
-msgstr[1] "%d hours"
+#: ../src/disks/gduunlockdialog.c:143
+msgid "The encryption passphrase was retrieved from the keyring"
+msgstr "The encryption passphrase was retrieved from the keyring"
 
 #. Translators: This is shown in the volume grid for a partition with a name/label.
 #. *              The %d is the partition number. The %s is the name
 #.
-#: ../src/palimpsest/gduvolumegrid.c:1536
+#: ../src/disks/gduvolumegrid.c:1525
 #, c-format
 msgctxt "volume-grid"
 msgid "Partition %d: %s"
@@ -2103,58 +2617,58 @@ msgstr "Partition %d: %s"
 #. Translators: This is shown in the volume grid for a partition with no name/label.
 #. *              The %d is the partition number
 #.
-#: ../src/palimpsest/gduvolumegrid.c:1543
+#: ../src/disks/gduvolumegrid.c:1532
 #, c-format
 msgctxt "volume-grid"
 msgid "Partition %d"
 msgstr "Partition %d"
 
-#: ../src/palimpsest/gduvolumegrid.c:1563
+#: ../src/disks/gduvolumegrid.c:1552
 msgid "No Media"
 msgstr "No Medium"
 
-#: ../src/palimpsest/gduvolumegrid.c:1580
+#: ../src/disks/gduvolumegrid.c:1569
 msgctxt "volume-grid"
 msgid "Free Space"
 msgstr "Free Space"
 
-#: ../src/palimpsest/gduvolumegrid.c:1622
+#: ../src/disks/gduvolumegrid.c:1611
 msgctxt "volume-grid"
 msgid "Extended Partition"
 msgstr "Extended Partition"
 
-#: ../src/palimpsest/gduvolumegrid.c:1646
+#: ../src/disks/gduvolumegrid.c:1635
 msgctxt "volume-grid"
 msgid "Filesystem"
 msgstr "Filesystem"
 
-#: ../src/palimpsest/gduvolumegrid.c:1665
+#: ../src/disks/gduvolumegrid.c:1653
 msgctxt "volume-grid"
 msgid "Swap"
 msgstr "Swap"
 
-#: ../src/palimpsest/gduwindow.c:531
+#: ../src/disks/gduwindow.c:612
 msgid "Error deleting loop device"
 msgstr "Error deleting loop device"
 
-#: ../src/palimpsest/gduwindow.c:602 ../src/palimpsest/gduwindow.c:674
+#: ../src/disks/gduwindow.c:683 ../src/disks/gduwindow.c:754
 msgid "Error attaching disk image"
 msgstr "Error attaching disk image"
 
-#: ../src/palimpsest/gduwindow.c:642
+#: ../src/disks/gduwindow.c:723
 msgid "Select Disk Image to Attach"
 msgstr "Select Disk Image to Attach"
 
-#: ../src/palimpsest/gduwindow.c:646
+#: ../src/disks/gduwindow.c:727
 msgid "_Attach"
 msgstr "_Attach"
 
 #. Add a RO check button that defaults to RO
-#: ../src/palimpsest/gduwindow.c:652
+#: ../src/disks/gduwindow.c:732
 msgid "Set up _read-only loop device"
 msgstr "Set up _read-only loop device"
 
-#: ../src/palimpsest/gduwindow.c:653
+#: ../src/disks/gduwindow.c:733
 msgid ""
 "If checked, the loop device will be read-only. This is useful if you don't "
 "want the underlying file to be modified"
@@ -2163,28 +2677,49 @@ msgstr ""
 "want the underlying file to be modified"
 
 #. Translators: Shown for a read-only device. The %s is the device file, e.g. /dev/sdb1
-#: ../src/palimpsest/gduwindow.c:1515
+#: ../src/disks/gduwindow.c:1699
 #, c-format
 msgid "%s <span size=\"smaller\">(Read-Only)</span>"
 msgstr "%s <span size=\"smaller\">(Read-Only)</span>"
 
-#: ../src/palimpsest/gduwindow.c:1822
+#. Translators: Shown instead of e.g. "10 seconds remaining" when we've passed
+#. * the expected end time...
+#.
+#: ../src/disks/gduwindow.c:1731
+msgctxt "job-remaining-exceeded"
+msgid "Almost done..."
+msgstr "Almost doneâ"
+
+#: ../src/disks/gduwindow.c:1736
+#, c-format
+msgctxt "job-remaining"
+msgid "%s remaining"
+msgstr "%s remaining"
+
+#. Translators: Shown in "Location" when drive is connected to another seat than where
+#. * our application is running.
+#.
+#: ../src/disks/gduwindow.c:1892
+msgid "Connected to another seat"
+msgstr "Connected to another seat"
+
+#: ../src/disks/gduwindow.c:2193
 msgctxt "partition type"
 msgid "Unknown"
 msgstr "Unknown"
 
-#: ../src/palimpsest/gduwindow.c:1849
+#: ../src/disks/gduwindow.c:2225
 msgid "Extended Partition"
 msgstr "Extended Partition"
 
 #. Translators: Use for mount point '/' simply because '/' is too small to hit as a hyperlink
 #.
-#: ../src/palimpsest/gduwindow.c:1890
+#: ../src/disks/gduwindow.c:2266
 msgid "Filesystem Root"
 msgstr "Filesystem Root"
 
 #. Translators: Shown next to "In Use". The first %s is the mount point, e.g. /media/foobar
-#: ../src/palimpsest/gduwindow.c:1898
+#: ../src/disks/gduwindow.c:2274
 #, c-format
 msgid "Yes, mounted at %s"
 msgstr "Yes, mounted at %s"
@@ -2192,70 +2727,278 @@ msgstr "Yes, mounted at %s"
 #. Translators: Shown when the device is not mounted next to the "In Use" label
 #. Translators: Shown if the swap device is not in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is not unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1904 ../src/palimpsest/gduwindow.c:1940
-#: ../src/palimpsest/gduwindow.c:1966
+#: ../src/disks/gduwindow.c:2280 ../src/disks/gduwindow.c:2316
+#: ../src/disks/gduwindow.c:2342
 msgid "No"
 msgstr "No"
 
 #. Translators: Shown if the swap device is in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1934 ../src/palimpsest/gduwindow.c:1960
+#: ../src/disks/gduwindow.c:2310 ../src/disks/gduwindow.c:2336
 msgid "Yes"
 msgstr "Yes"
 
 #. Translators: used to convey free space for partitions - the %s is the
 #. * partition table format e.g. "Master Boot Record" or "GUID Partition Table"
 #.
-#: ../src/palimpsest/gduwindow.c:2039
+#: ../src/disks/gduwindow.c:2470
 #, c-format
 msgid "Unallocated Space (%s)"
 msgstr "Unallocated Space (%s)"
 
 #. Translators: used to convey free space for partitions (partition table format not known)
-#: ../src/palimpsest/gduwindow.c:2044
+#: ../src/disks/gduwindow.c:2475
 msgid "Unallocated Space"
 msgstr "Unallocated Space"
 
-#: ../src/palimpsest/gduwindow.c:2400
+#: ../src/disks/gduwindow.c:2764
+msgid "An error occurred when trying to put the drive into standby mode"
+msgstr "An error occurred when trying to put the drive into standby mode"
+
+#: ../src/disks/gduwindow.c:2810
+msgid "An error occurred when trying to wake up the drive from standby mode"
+msgstr "An error occurred when trying to wake up the drive from standby mode"
+
+#: ../src/disks/gduwindow.c:2885
 msgid "Error mounting filesystem"
 msgstr "Error mounting filesystem"
 
-#: ../src/palimpsest/gduwindow.c:2440
+#: ../src/disks/gduwindow.c:2925
 msgid "Error unmounting filesystem"
 msgstr "Error unmounting filesystem"
 
-#: ../src/palimpsest/gduwindow.c:2519
+#: ../src/disks/gduwindow.c:3006
 msgid "Error deleting partition"
 msgstr "Error deleting partition"
 
-#: ../src/palimpsest/gduwindow.c:2535
+#: ../src/disks/gduwindow.c:3022
 msgid "Are you sure you want to delete the partition?"
 msgstr "Are you sure you want to delete the partition?"
 
-#: ../src/palimpsest/gduwindow.c:2536
+#: ../src/disks/gduwindow.c:3023
 msgid "All data on the partition will be lost"
 msgstr "All data on the partition will be lost"
 
-#: ../src/palimpsest/gduwindow.c:2537
+#: ../src/disks/gduwindow.c:3024
 msgid "_Delete"
 msgstr "_Delete"
 
-#: ../src/palimpsest/gduwindow.c:2568
+#: ../src/disks/gduwindow.c:3055
 msgid "Error ejecting media"
 msgstr "Error ejecting medium"
 
-#: ../src/palimpsest/gduwindow.c:2620
+#: ../src/disks/gduwindow.c:3107
 msgid "Error locking encrypted device"
 msgstr "Error locking encrypted device"
 
-#: ../src/palimpsest/gduwindow.c:2661
+#: ../src/disks/gduwindow.c:3148
 msgid "Error starting swap"
 msgstr "Error starting swap"
 
-#: ../src/palimpsest/gduwindow.c:2698
+#: ../src/disks/gduwindow.c:3185
 msgid "Error stopping swap"
 msgstr "Error stopping swap"
 
+#: ../src/disks/gduwindow.c:3227
+msgid "Error setting autoclear flag"
+msgstr "Error setting autoclear flag"
+
+#: ../src/disks/gduwindow.c:3280 ../src/disks/gduwindow.c:3335
+msgid "Error canceling job"
+msgstr "Error cancelling job"
+
+#: ../src/libgdu/gduutils.c:86
+msgid "All Files"
+msgstr "All Files"
+
+#: ../src/libgdu/gduutils.c:90
+msgid "Disk Images (*.img, *.iso)"
+msgstr "Disk Images (*.img, *.iso)"
+
+#. Translators: Used for number of years
+#: ../src/libgdu/gduutils.c:403
+#, c-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d year"
+msgstr[1] "%d years"
+
+#. Translators: Used for number of months
+#: ../src/libgdu/gduutils.c:410
+#, c-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d month"
+msgstr[1] "%d months"
+
+#. Translators: Used for number of days
+#: ../src/libgdu/gduutils.c:417
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d day"
+msgstr[1] "%d days"
+
+#. Translators: Used for number of hours
+#: ../src/libgdu/gduutils.c:424
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d hour"
+msgstr[1] "%d hours"
+
+#. Translators: Used for number of minutes
+#: ../src/libgdu/gduutils.c:431
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d minute"
+msgstr[1] "%d minutes"
+
+#. Translators: Used for number of seconds
+#: ../src/libgdu/gduutils.c:438
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d second"
+msgstr[1] "%d seconds"
+
+#. Translators: Used for number of milli-seconds
+#: ../src/libgdu/gduutils.c:445
+#, c-format
+msgid "%d milli-second"
+msgid_plural "%d milli-seconds"
+msgstr[0] "%d milli-second"
+msgstr[1] "%d milli-seconds"
+
+#. Translators: Used for duration greater than one year. First %s is number of years, second %s is months, third %s is days
+#: ../src/libgdu/gduutils.c:509
+#, c-format
+msgctxt "duration-year-to-inf"
+msgid "%s, %s and %s"
+msgstr "%s, %s and %s"
+
+#. Translators: Used for durations less than one year but greater than one month. First %s is number of months, second %s is days
+#: ../src/libgdu/gduutils.c:514
+#, c-format
+msgctxt "duration-months-to-year"
+msgid "%s and %s"
+msgstr "%s and %s"
+
+#. Translators: Used for durations less than one month but greater than one day. First %s is number of days, second %s is hours
+#: ../src/libgdu/gduutils.c:519
+#, c-format
+msgctxt "duration-day-to-month"
+msgid "%s and %s"
+msgstr "%s and %s"
+
+#. Translators: Used for durations less than one day but greater than one hour. First %s is number of hours, second %s is minutes
+#: ../src/libgdu/gduutils.c:524
+#, c-format
+msgctxt "duration-hour-to-day"
+msgid "%s and %s"
+msgstr "%s and %s"
+
+#. Translators: Used for durations less than one hour but greater than one minute. First %s is number of minutes, second %s is seconds
+#: ../src/libgdu/gduutils.c:535
+#, c-format
+msgctxt "duration-minute-to-hour"
+msgid "%s and %s"
+msgstr "%s and %s"
+
+#: ../src/libgdu/gduutils.c:544
+msgctxt "duration"
+msgid "Less than a minute"
+msgstr "Less than a minute"
+
+#. Translators: Used for durations less than one minute byte greater than one second. First %s is number of seconds
+#: ../src/libgdu/gduutils.c:549
+#, c-format
+msgctxt "duration-second-to-minute"
+msgid "%s"
+msgstr "%s"
+
+#. Translators: Used for durations less than one second. First %s is number of milli-seconds
+#: ../src/libgdu/gduutils.c:555
+#, c-format
+msgctxt "duration-zero-to-second"
+msgid "%s"
+msgstr "%s"
+
+#~ msgid "<big>Change Passphrase</big>"
+#~ msgstr "<big>Change Passphrase</big>"
+
+#~ msgid "<big>Create Disk Image</big>"
+#~ msgstr "<big>Create Disk Image</big>"
+
+#~ msgid "<big>Create Partition</big>"
+#~ msgstr "<big>Create Partition</big>"
+
+#~ msgid "<big>Contents</big>"
+#~ msgstr "<big>Contents</big>"
+
+#~ msgid "<big>Edit Partition</big>"
+#~ msgstr "<big>Edit Partition</big>"
+
+#~ msgid "<big>Format Disk</big>"
+#~ msgstr "<big>Format Disk</big>"
+
+#~ msgid "<big>Format Volume</big>"
+#~ msgstr "<big>Format Volume</big>"
+
+#~ msgid "<b>_Volumes</b>"
+#~ msgstr "<b>_Volumes</b>"
+
+#~ msgid "<big>Restore Disk Image</big>"
+#~ msgstr "<big>Restore Disk Image</big>"
+
+#~ msgid "Updates"
+#~ msgstr "Updates"
+
+#~ msgid "Normalized"
+#~ msgstr "Normalised"
+
+#~ msgid "%.1f hour"
+#~ msgid_plural "%.1f hours"
+#~ msgstr[0] "%.1f hour"
+#~ msgstr[1] "%.1f hours"
+
+#~ msgid "%.1f second"
+#~ msgid_plural "%.1f seconds"
+#~ msgstr[0] "%.1f second"
+#~ msgstr[1] "%.1f seconds"
+
+#~ msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
+#~ msgstr "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
+
+#~ msgid ""
+#~ "Failure is a sign the disk exceeded its intended design life period (Old-"
+#~ "Age)"
+#~ msgstr ""
+#~ "Failure is a sign the disk exceeded its intended design life period (Old-"
+#~ "Age)"
+
+#~ msgid "Every time data is collected (Online)"
+#~ msgstr "Every time data is collected (Online)"
+
+#~ msgid "Only during off-line activities (Not Online)"
+#~ msgstr "Only during offline activities (Not Online)"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "Self-test in progress â %d%% remaining"
+#~ msgstr "Self-test in progress â %d%% remaining"
+
+#~ msgid "Copying data from device <i>%s</i>..."
+#~ msgstr "Copying data from device <i>%s</i>â"
+
+#~ msgid "All data on the volume will be lost"
+#~ msgstr "All data on the volume will be lost"
+
+#~ msgid "Copying data to device <i>%s</i>..."
+#~ msgstr "Copying data to device <i>%s</i>â"
+
 #~ msgid "Disk Utility"
 #~ msgstr "Disk Utility"
 
@@ -2296,9 +3039,6 @@ msgstr "Error stopping swap"
 #~ msgid "Gnome Disk Utility formatting tool"
 #~ msgstr "Gnome Disk Utility formatting tool"
 
-#~ msgid "Format partition %d of %s (%s)"
-#~ msgstr "Format partition %d of %s (%s)"
-
 #~ msgid "Formatting partition %d of %s (%s)"
 #~ msgstr "Formatting partition %d of %s (%s)"
 
@@ -2308,9 +3048,6 @@ msgstr "Error stopping swap"
 #~ msgid "Formatting %s (%s)"
 #~ msgstr "Formatting %s (%s)"
 
-#~ msgid "Format %s Volume (%s)"
-#~ msgstr "Format %s Volume (%s)"
-
 #~ msgid "Formatting %s Volume (%s)"
 #~ msgstr "Formatting %s Volume (%s)"
 
@@ -2548,9 +3285,6 @@ msgstr "Error stopping swap"
 #~ msgid "Choose Server"
 #~ msgstr "Choose Server"
 
-#~ msgid "Connect to Server"
-#~ msgstr "Connect to Server"
-
 #~ msgid "_Browse..."
 #~ msgstr "_Browseâ"
 
@@ -2599,9 +3333,6 @@ msgstr "Error stopping swap"
 #~ msgid "The pool of devices"
 #~ msgstr "The pool of devices"
 
-#~ msgid "RAID Level"
-#~ msgstr "RAID Level"
-
 #~ msgid "The selected RAID level"
 #~ msgstr "The selected RAID level"
 
@@ -2617,9 +3348,6 @@ msgstr "Error stopping swap"
 #~ msgid "The size of each component"
 #~ msgstr "The size of each component"
 
-#~ msgid "Stripe Size"
-#~ msgstr "Stripe Size"
-
 #~ msgid "The requested stripe size of the array"
 #~ msgstr "The requested stripe size of the array"
 
@@ -2721,9 +3449,6 @@ msgstr "Error stopping swap"
 #~ msgid "Array of selected drives"
 #~ msgstr "Array of selected drives"
 
-#~ msgid "Number of available disks"
-#~ msgstr "Number of available disks"
-
 #~ msgid "Largest Segment For Selected"
 #~ msgstr "Largest Segment for Selected"
 
@@ -2804,9 +3529,6 @@ msgstr "Error stopping swap"
 #~ msgid "Are you sure you want to start a read/write benchmark?"
 #~ msgstr "Are you sure you want to start a read/write benchmark?"
 
-#~ msgid "_Benchmark"
-#~ msgstr "_Benchmark"
-
 #~ msgid "%s (%s) â Benchmark"
 #~ msgstr "%s (%s) â Benchmark"
 
@@ -2822,18 +3544,6 @@ msgstr "Error stopping swap"
 #~ msgid "Maximum Write Rate:"
 #~ msgstr "Maximum Write Rate:"
 
-#~ msgid "Average Read Rate:"
-#~ msgstr "Average Read Rate:"
-
-#~ msgid "Average Write Rate:"
-#~ msgstr "Average Write Rate:"
-
-#~ msgid "Last Benchmark:"
-#~ msgstr "Last Benchmark:"
-
-#~ msgid "Average Access Time:"
-#~ msgstr "Average Access Time:"
-
 #~ msgid "Start _Read-Only Benchmark"
 #~ msgstr "Start _Read-Only Benchmark"
 
@@ -2846,15 +3556,6 @@ msgstr "Error stopping swap"
 #~ msgid "Measure read rate, write rate and access time"
 #~ msgstr "Measure read rate, write rate and access time"
 
-#~ msgid "%d MB/s"
-#~ msgstr "%d MB/s"
-
-#~ msgid "%3g ms"
-#~ msgstr "%3g ms"
-
-#~ msgid "Never"
-#~ msgstr "Never"
-
 #~ msgid "Cancels the currently running benchmark"
 #~ msgstr "Cancels the currently running benchmark"
 
@@ -3299,9 +4000,6 @@ msgstr "Error stopping swap"
 #~ msgid "HDDVD"
 #~ msgstr "HD DVD"
 
-#~ msgid "%s %s Drive"
-#~ msgstr "%s %s Drive"
-
 #~ msgid "%s Hard Disk"
 #~ msgstr "%s Hard Disk"
 
@@ -3445,9 +4143,6 @@ msgstr "Error stopping swap"
 #~ msgid "Error enumerating adapters: %s"
 #~ msgstr "Error enumerating adapters: %s"
 
-#~ msgid "Error enumerating expanders: %s"
-#~ msgstr "Error enumerating expanders: %s"
-
 #~ msgid "Error enumerating ports: %s"
 #~ msgstr "Error enumerating ports: %s"
 
@@ -3479,9 +4174,6 @@ msgstr "Error stopping swap"
 #~ msgid "Error logging in"
 #~ msgstr "Error logging in"
 
-#~ msgid "Error sending `%s': %s"
-#~ msgstr "Error sending '%s': %s"
-
 #~ msgid ""
 #~ "Unexpected stderr output - expected `udisks-tcp-bridge: Waiting for "
 #~ "secret' but got `%s'"
@@ -3640,9 +4332,6 @@ msgstr "Error stopping swap"
 #~ msgid "Deleting Partition"
 #~ msgstr "Deleting Partition"
 
-#~ msgid "Creating Partition"
-#~ msgstr "Creating Partition"
-
 #~ msgid "Modifying Partition"
 #~ msgstr "Modifying Partition"
 
@@ -3829,9 +4518,6 @@ msgstr "Error stopping swap"
 #~ msgid "Unused Partition"
 #~ msgstr "Unused Partition"
 
-#~ msgid "Empty Partition"
-#~ msgstr "Empty Partition"
-
 #~ msgid "Driver Partition"
 #~ msgstr "Driver Partition"
 
@@ -4083,9 +4769,6 @@ msgstr "Error stopping swap"
 #~ msgid "Unknown"
 #~ msgstr "Unknown"
 
-#~ msgid "%s at %s"
-#~ msgstr "%s at %s"
-
 #~ msgctxt "RAID level"
 #~ msgid "Stripe (RAID-0)"
 #~ msgstr "Stripe (RAID-0)"
@@ -4424,10 +5107,6 @@ msgstr "Error stopping swap"
 #~ msgid "Enabled"
 #~ msgstr "Enabled"
 
-#~ msgctxt "Write Cache"
-#~ msgid "Disabled"
-#~ msgstr "Disabled"
-
 #~ msgctxt "Rotation Rate"
 #~ msgid "%d RPM"
 #~ msgstr "%d RPM"
@@ -4439,9 +5118,6 @@ msgstr "Error stopping swap"
 #~ msgid "Unknown Scheme: %s"
 #~ msgstr "Unknown Scheme: %s"
 
-#~ msgid "Error launching Brasero"
-#~ msgstr "Error launching Brasero"
-
 #~ msgid "The application is not installed"
 #~ msgstr "The application is not installed"
 
@@ -4465,9 +5141,6 @@ msgstr "Error stopping swap"
 #~ msgid "Firmware Version:"
 #~ msgstr "Firmware Version:"
 
-#~ msgid "Location:"
-#~ msgstr "Location:"
-
 #~ msgid "Write Cache:"
 #~ msgstr "Write Cache:"
 
@@ -4899,18 +5572,9 @@ msgstr "Error stopping swap"
 #~ msgid "Un_lock Volume"
 #~ msgstr "Un_lock Volume"
 
-#~ msgid "Make encrypted data available"
-#~ msgstr "Make encrypted data available"
-
 #~ msgid "Forge_t Passphrase"
 #~ msgstr "Forge_t Passphrase"
 
-#~ msgid "Delete passphrase from keyring"
-#~ msgstr "Delete passphrase from keyring"
-
-#~ msgid "Change passphrase"
-#~ msgstr "Change passphrase"
-
 #~ msgid "_Create Logical Volume"
 #~ msgstr "_Create Logical Volume"
 
@@ -4986,9 +5650,6 @@ msgstr "Error stopping swap"
 #~ msgid "Get Help on Disk Utility"
 #~ msgstr "Get Help on Disk Utility"
 
-#~ msgid "An error occured"
-#~ msgstr "An error occurred"
-
 #~ msgid "The operation failed."
 #~ msgstr "The operation failed."
 
@@ -5122,12 +5783,6 @@ msgstr "Error stopping swap"
 #~ msgid "The serial number of the disk"
 #~ msgstr "The serial number of the disk"
 
-#~ msgid "%"
-#~ msgstr "%"
-
-#~ msgid "Short self-test in progress: "
-#~ msgstr "Short self-test in progress: "
-
 #~ msgid "Extended self-test in progress: "
 #~ msgstr "Extended self-test in progress: "
 
@@ -5184,9 +5839,6 @@ msgstr "Error stopping swap"
 #~ "Only volumes of acceptable sizes can be selected. You may need to "
 #~ "manually create new volumes of acceptable sizes."
 
-#~ msgid "Add _Volume"
-#~ msgstr "Add _Volume"
-
 #~ msgid ""
 #~ "The data on component \"%s\" of the RAID Array \"%s\" will be irrecovably "
 #~ "erased and the RAID Array might be degraded. Make sure important data is "
@@ -5476,9 +6128,6 @@ msgstr "Error stopping swap"
 #~ msgid "There was an error stopping the drive \"%s\"."
 #~ msgstr "There was an error stopping the drive \"%s\"."
 
-#~ msgid "_Erase"
-#~ msgstr "_Erase"
-
 #~ msgid "Palimpsest Disk Utility"
 #~ msgstr "Palimpsest Disk Utility"
 
@@ -5491,9 +6140,6 @@ msgstr "Error stopping swap"
 #~ msgid "Create a new Software RAID array"
 #~ msgstr "Create a new Software RAID array"
 
-#~ msgid "_Mount"
-#~ msgstr "_Mount"
-
 #~ msgid "Detach the device from the system, powering it off"
 #~ msgstr "Detach the device from the system, powering it off"
 
@@ -5603,9 +6249,6 @@ msgstr "Error stopping swap"
 #~ msgid "View:"
 #~ msgstr "View:"
 
-#~ msgid "6 hours"
-#~ msgstr "6 hours"
-
 #~ msgid "24 hours"
 #~ msgstr "24 hours"
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]