[gnome-disk-utility] Updated Bulgarian translation

[Alexander Alexandrov Shopov <al_shopov src gnome org>]

commit 344163bc5d70d581a747d7f09b08846ce9100510
Author: Ivaylo Valkov <ivaylo e-valkov org>
Date:   Sat Sep 15 10:18:43 2012 +0300

    Updated Bulgarian translation

 po/bg.po | 2026 +++++++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 1353 insertions(+), 673 deletions(-)
---
diff --git a/po/bg.po b/po/bg.po
index 807da38..48d9c87 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-disk-utility master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-04-01 17:39+0300\n"
-"PO-Revision-Date: 2012-04-01 17:41+0300\n"
+"POT-Creation-Date: 2012-09-15 10:18+0300\n"
+"PO-Revision-Date: 2012-08-16 12:54+0300\n"
 "Last-Translator: Ivaylo Valkov <ivaylo e-valkov org>\n"
 "Language-Team: Bulgarian <dict fsa-bg org>\n"
 "Language: bg\n"
@@ -18,15 +18,34 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\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 "ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ"
+
+#: ../data/gnome-disk-image-mounter.desktop.in.h:2
+msgid "Mount Disk Images"
+msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ"
+
+#: ../data/gnome-disks.desktop.in.h:1 ../data/ui/about-dialog.ui.h:1
+#: ../src/disks/gduwindow.c:1000
 msgid "Disks"
 msgstr "ÐÐÑÐÐÐÐ"
 
-#: ../data/palimpsest.desktop.in.h:2
+#: ../data/gnome-disks.desktop.in.h:2
 msgid "Manage Drives and Media"
 msgstr "ÐÐÑÐÐÐÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐ Ð ÐÐÑÐÑÐÐÐ"
 
+#: ../data/org.gnome.Disks.gschema.xml.in.in.h:1
+msgid "Default location for the Create/Restore disk image dialogs"
+msgstr ""
+
+#: ../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 ""
+
 #: ../data/ui/about-dialog.ui.h:2
 msgid ""
 "Copyright  2008-2012 Red Hat, Inc.\n"
@@ -46,12 +65,14 @@ msgstr ""
 "ÐÐÐÐÑÐÐÐÑÑ ÐÐÐÐÐ <ash kambanaria org>\n"
 "\n"
 "ÐÑÐÐÐÑÑÑ ÐÐ ÐÑÐÐÐÐ ÐÐ GNOME ÐÐÐ ÐÑÐÐÐ ÐÑ ÐÐÐÐÑÐÐÐ.\n"
-"ÐÐÑÑÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑ ÐÐ <a href=\"http://gnome.cult.bg\";>http://gnome.cult.bg</a>\n"
-"ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐÐ ÐÐ <a href=\"http://gnome.cult.bg/bugs\";>http://gnome.cult.bg/bugs</a>"
+"ÐÐÑÑÐÑÐ ÐÐÐÐÑÐ ÐÐ ÐÐÑ ÐÐ <a href=\"http://gnome.cult.bg\";>http://gnome.cult.";
+"bg</a>\n"
+"ÐÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÑÐÐ ÐÐ <a href=\"http://gnome.cult.bg/bugs\";>http://gnome.";
+"cult.bg/bugs</a>"
 
 #: ../data/ui/app-menu.ui.h:1
 msgid "Attach Disk _Image..."
-msgstr "_ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐ Ñ _ÐÐÑÐÐâ"
 
 #: ../data/ui/app-menu.ui.h:2
 msgid "_About Disks"
@@ -61,17 +82,121 @@ msgstr "_ÐÑÐÐÑÐÐ"
 msgid "_Quit"
 msgstr "_ÐÐÐÑÐÐÐ ÐÐ ÐÑÐÐÑÐÐÐÑÐ"
 
+#: ../data/ui/benchmark-dialog.ui.h:1
+msgid "Benchmark"
+msgstr "ÐÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑâ"
+
+#: ../data/ui/benchmark-dialog.ui.h:2
+msgid "_Start Benchmark..."
+msgstr "_ÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÑÑ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑâ"
+
+#: ../data/ui/benchmark-dialog.ui.h:3
+msgid "_Abort Benchmark"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:4
+msgid "Last Benchmarked"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:5
+msgid "Average Read Rate"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:6
+msgid "Average Write Rate"
+msgstr "ÐÑÐÐÐÐ ÑÐÐÑÐÑÑ ÐÑÐ ÐÐÐÐÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:7
+msgid "Average Access Time"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:8
+msgid "Disk Drive or Device"
+msgstr "ÐÐÑÐ ÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:9
+msgid "Sample Size"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:10
+msgid "_Start Benchmarking..."
+msgstr "_ÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÑÑÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑâ"
+
+#: ../data/ui/benchmark-dialog.ui.h:11
+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 ""
+
+#: ../data/ui/benchmark-dialog.ui.h:12
+#, fuzzy
+msgid "Transfer Rate"
+msgstr "ÐÐÑÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÐÑÐÑÑÑÐÐ ÐÑÐÐÐÐÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:13
+msgid "Number of S_amples"
+msgstr "ÐÑÐÐ ÐÐ _ÐÑÑÐÑÐÑÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:14
+msgid "Sample S_ize (MiB)"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:15
+msgid "Also perform _write-benchmark"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:16
+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 ""
+
+#: ../data/ui/benchmark-dialog.ui.h:19
+msgid ""
+"Number of samples. Bigger number produces a more accurate picture of access "
+"time patterns but takes more time."
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:20
+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 ""
+
+#: ../data/ui/benchmark-dialog.ui.h:21
+msgid "Access Time"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:22
+msgid "Number of Sampl_es"
+msgstr "ÐÑÐÐ ÐÐ ÐÑÑÐÑÐÑ_Ð"
+
+#: ../data/ui/benchmark-dialog.ui.h:23
+msgid ""
+"Number of samples. Bigger number produces more smooth graphs but the "
+"benchmark will take more time."
+msgstr ""
+
 #: ../data/ui/change-passphrase-dialog.ui.h:1
-#: ../data/ui/edit-dos-partition-dialog.ui.h:1
+#: ../data/ui/edit-dos-partition-dialog.ui.h:2
 #: ../data/ui/edit-filesystem-dialog.ui.h:2
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
-#: ../data/ui/edit-partition-dialog.ui.h:1
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:2
+#: ../data/ui/edit-partition-dialog.ui.h:2
 msgid "C_hange"
 msgstr "_ÐÑÐÐÑÐÐ"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:2
-msgid "<big>Change Passphrase</big>"
-msgstr "<big>ÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ</big>"
+#, fuzzy
+msgid "Change Passphrase"
+msgstr "ÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐâ"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:3
 msgid "Curr_ent Passphrase"
@@ -110,38 +235,35 @@ msgid "New _Passphrase"
 msgstr "ÐÐÐÐ _ÐÐÑÐÐÐ"
 
 #: ../data/ui/create-disk-image-dialog.ui.h:1
-msgid "<big>Create Disk Image</big>"
-msgstr "<big>ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐ</big>"
-
-#: ../data/ui/create-disk-image-dialog.ui.h:2
-msgid "_Start Creating..."
-msgstr "_ÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÑÐÐÐÐÐÐÐÑÐâ"
-
-#: ../data/ui/create-disk-image-dialog.ui.h:3
-#: ../data/ui/edit-crypttab-dialog.ui.h:3
+#: ../data/ui/edit-crypttab-dialog.ui.h:4
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:5
 #: ../data/ui/filesystem-create.ui.h:2
 msgid "_Name"
 msgstr "_ÐÐÐ"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:4
+#: ../data/ui/create-disk-image-dialog.ui.h:2
 msgid "Save in _folder"
 msgstr "ÐÐÐÐÐÐÐÐÐ Ð Ð_ÐÐÐÐ"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:5
+#: ../data/ui/create-disk-image-dialog.ui.h:3
 msgid "Select a Folder"
 msgstr "ÐÐÐÐÑ ÐÐ ÐÐÐÐÐ"
 
-#: ../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 "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÑÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
 
+#: ../data/ui/create-disk-image-dialog.ui.h:5
+msgid "_Start Creating..."
+msgstr "_ÐÑÐÑÑÐÑÐÐÐ ÐÐ ÑÑÐÐÐÐÐÐÐÑÐâ"
+
 #: ../data/ui/create-partition-dialog.ui.h:1
 msgid "C_reate"
 msgstr "_ÐÑÐÐÐÐÐÐÐ"
 
 #: ../data/ui/create-partition-dialog.ui.h:2
-msgid "<big>Create Partition</big>"
+#, fuzzy
+msgid "Create Partition"
 msgstr "<big>ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÑÐ</big>"
 
 #: ../data/ui/create-partition-dialog.ui.h:3
@@ -164,15 +286,239 @@ msgstr "ÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÑÑÐÐ _ÐÑÐÐÐ"
 msgid "The free space following the partition, in megabytes"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÑÐÑÑÑÐÐÑÑÐÐ Ð ÐÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÐÐ."
 
-#: ../data/ui/create-partition-dialog.ui.h:8
-msgid "<big>Contents</big>"
-msgstr "<big>ÐÑÐÑÑÐÐÐÐÐ</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 "ÐÑÐÑÑÐÐÐÐÐ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:1
+msgid "Drive Settings"
+msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:2
+msgid "_Standby Timeout"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:3
+msgid "Enter Standby After"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:4
+msgid "_Advanced Power Management"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:5
+msgid "APM Level"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:6
+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 ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:7
+msgid "Automatic Aco_ustic Management"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:8
+msgid "Vendor Recommended"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:9
+msgid "AAM Level"
+msgstr ""
+
+#: ../data/ui/disks.ui.h:1
+msgid "Create a new partition..."
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÐÑÐâ"
+
+#: ../data/ui/disks.ui.h:2
+msgid "Mount the filesystem"
+msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ"
+
+#: ../data/ui/disks.ui.h:3
+msgid "Unmount the filesystem"
+msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ"
+
+#: ../data/ui/disks.ui.h:4
+msgid "Eject the media"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑ"
+
+#: ../data/ui/disks.ui.h:5
+msgid "Unlock the encrypted device"
+msgstr "ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ"
+
+#: ../data/ui/disks.ui.h:6
+msgid "Activate the swap space"
+msgstr "ÐÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÑ"
+
+#: ../data/ui/disks.ui.h:7
+msgid "Deactivate the swap space"
+msgstr "ÐÐÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÑ"
+
+#: ../data/ui/disks.ui.h:8
+msgid "Lock the encrypted device"
+msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ"
+
+#: ../data/ui/disks.ui.h:9
+msgid "More actions..."
+msgstr "ÐÑÑÐÐ ÐÐÐÑÑÐÐÑâ"
+
+#: ../data/ui/disks.ui.h:10
+msgid "Delete partition..."
+msgstr "ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÑÐÐâ"
+
+#: ../data/ui/disks.ui.h:11
+msgid "Attach Disk Image..."
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
+
+#: ../data/ui/disks.ui.h:12
+msgid "Detach Disk Image"
+msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐ"
+
+#: ../data/ui/disks.ui.h:13
+msgid "Select a device"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÑÑÑÐÐÑÑÐÐ"
+
+#: ../data/ui/disks.ui.h:14
+msgid "Model"
+msgstr "ÐÐÐÐÐ"
+
+#: ../data/ui/disks.ui.h:15
+msgid "Serial Number"
+msgstr "ÐÐÑÐÐÐ ÐÐÐÐÑ"
+
+#: ../data/ui/disks.ui.h:16
+msgid "World Wide Name"
+msgstr "ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ (WWN)"
+
+#. 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 "ÐÐÑÑÐÐÐÐÐÐÐÐÐÐ"
+
+#: ../data/ui/disks.ui.h:19
+msgid "Media"
+msgstr "ÐÐÑÐÑÐÐ"
+
+#: ../data/ui/disks.ui.h:20
+msgid "Size"
+msgstr "ÐÐÐÐÐÑ"
+
+#. 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 "ÐÑÐÐÐÐ"
+
+#: ../data/ui/disks.ui.h:22
+msgid "Eject media"
+msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑ"
+
+#: ../data/ui/disks.ui.h:23
+msgid "Pending Operation"
+msgstr ""
+
+#: ../data/ui/disks.ui.h:24
+#, fuzzy
+msgid "_Volumes"
+msgstr "<big>_ÐÐÐÐÐÐ</big>"
+
+#: ../data/ui/disks.ui.h:27
+msgid "Device"
+msgstr "ÐÑÑÑÐÐÑÑÐÐ"
+
+# ÐÐÐÐÐÐÐÐ ÑÐ Ð ÐÐÐÑÐÐÑÑ Ñ ÐÑÑÐÐ ÐÐÐÐÐÐ â No; Yes; Yes, mounted in.
+# ÐÑÐÐÐÐÐÐÐÐ: ÐÐÐÐÐÐÐÐ ÑÐ
+# ÐÑÐÐÐÐÐÐÐÐ: ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ
+# ÐÑÐÐÐÐÐÐÐÐ: ÐÐÐÑÐÑÐÐÐ Ð
+#: ../data/ui/disks.ui.h:28
+msgid "In Use"
+msgstr "ÐÑÐÐÐÐÐÐÐÐ"
+
+#: ../data/ui/disks.ui.h:29
+msgid "Auto-clear"
+msgstr ""
+
+#: ../data/ui/disks.ui.h:30
+msgid "Partition Type"
+msgstr "ÐÐÐ ÐÐ ÐÑÐÐ"
+
+#. 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 "ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÐÐÐ"
+
+#: ../data/ui/disks.ui.h:33
+msgid "Format Disk..."
+msgstr "ÐÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐâ"
+
+#: ../data/ui/disks.ui.h:34
+msgid "Create Disk Image..."
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
+
+#: ../data/ui/disks.ui.h:35
+msgid "Restore Disk Image..."
+msgstr "ÐÑÐÑÑÐÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
+
+#: ../data/ui/disks.ui.h:36
+msgid "Benchmark Drive..."
+msgstr ""
+
+#: ../data/ui/disks.ui.h:37
+msgid "SMART Data and Tests..."
+msgstr "ÐÐÑÑÐÐÐ Ð ÐÐÐÐÐ ÐÑ S.M.A.R.T.â"
+
+#: ../data/ui/disks.ui.h:38
+msgid "Drive Settings..."
+msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐâ"
+
+#: ../data/ui/disks.ui.h:39
+msgid "Standby Now"
+msgstr ""
+
+#: ../data/ui/disks.ui.h:40
+msgid "Wake-Up from Standby"
+msgstr ""
+
+#: ../data/ui/disks.ui.h:41
+msgid "Format..."
+msgstr "ÐÐÑÐÐÑÐÑÐÐÐâ"
+
+#: ../data/ui/disks.ui.h:42
+msgid "Edit Partition Type..."
+msgstr "ÐÐÐ ÐÐ ÐÑÐÐâ"
+
+#: ../data/ui/disks.ui.h:43
+msgid "Edit Filesystem Label..."
+msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐâ"
+
+#: ../data/ui/disks.ui.h:44
+msgid "Change Passphrase..."
+msgstr "ÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐâ"
+
+#: ../data/ui/disks.ui.h:45
+msgid "Edit Mount Options..."
+msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐÐâ"
+
+#: ../data/ui/disks.ui.h:46
+msgid "Edit Encryption Options..."
+msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐâ"
+
+#: ../data/ui/disks.ui.h:47
+msgid "Benchmark Volume..."
+msgstr ""
 
 #: ../data/ui/edit-crypttab-dialog.ui.h:1
+#, fuzzy
+msgid "Encryption Options"
+msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐâ"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:2
 msgid "_Automatic Encryption Options"
 msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ _ÐÐÑÐÐÐÑÐÑÐÐ ÑÐÑÑÐÑÐÐÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:2
+#: ../data/ui/edit-crypttab-dialog.ui.h:3
 msgid ""
 "Switch off <i>Automatic Encryption Options</i> to manage encryption options "
 "and passphrase for the device. The options correspond to an entry in the <b>/"
@@ -182,11 +528,11 @@ msgstr ""
 "ÐÐÑÑÑÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐ Ð ÐÐÑÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ. ÐÐÑÑÑÐÐÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐÑ "
 "ÐÑÐ ÑÐÐÐÐ <b>/etc/crypttab</b>."
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:4
+#: ../data/ui/edit-crypttab-dialog.ui.h:5
 msgid "Opt_ions"
 msgstr "_ÐÐÑÑÑÐÐÐÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:5
+#: ../data/ui/edit-crypttab-dialog.ui.h:6
 msgid ""
 "The name to use for the unlocked device - the device is set up as the name "
 "prefixed with <b>/dev/mapper</b>/"
@@ -194,20 +540,20 @@ msgstr ""
 "ÐÐÐÑÐ, ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ. ÐÑÑÑÐÐÑÑÐÐÑÐ ÑÐ ÐÑÐÐ "
 "ÐÐÑÑÑÐÐÐ ÐÐÑÐ ÐÐÐÑÐ ÐÑÐÐÑÐÐÐÐÐÐ ÐÑ <b>/dev/mapper</b>/"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:6
+#: ../data/ui/edit-crypttab-dialog.ui.h:7
 msgid "Options to use when unlocking the device"
 msgstr "ÐÐÑÑÑÐÐÐÐÑÐ, ÐÐÐÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐÑ ÐÑÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:7
+#: ../data/ui/edit-crypttab-dialog.ui.h:8
 msgid "Passphrase File"
 msgstr "ÐÐÐÐ Ñ ÐÐÑÐÐÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:8
+#: ../data/ui/edit-crypttab-dialog.ui.h:9
 #: ../data/ui/unlock-device-dialog.ui.h:3
 msgid "Sho_w passphrase"
 msgstr "ÐÐÐÐ_ÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:9
+#: ../data/ui/edit-crypttab-dialog.ui.h:10
 msgid ""
 "Passphrase of the device or empty to request from user when setting up the "
 "device"
@@ -215,25 +561,25 @@ msgstr ""
 "ÐÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ. ÐÐÐ Ð ÐÑÐÐÐÐ,  ÐÑÐ ÐÐÑÑÑÐÐÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ ÑÐ ÑÐ "
 "ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐÑÑ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:10 ../data/ui/filesystem-create.ui.h:8
+#: ../data/ui/edit-crypttab-dialog.ui.h:11 ../data/ui/filesystem-create.ui.h:8
 #: ../data/ui/unlock-device-dialog.ui.h:2
 msgid "_Passphrase"
 msgstr "_ÐÐÑÐÐÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:11
+#: ../data/ui/edit-crypttab-dialog.ui.h:12
 msgid "_Unlock at startup"
 msgstr "ÐÐ ÑÐ _ÐÑÐÐÑÑÐÐ ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:12
+#: ../data/ui/edit-crypttab-dialog.ui.h:13
 msgid "If checked, the device will be unlocked at startup [!noauto]"
 msgstr ""
 "ÐÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐ, ÑÑÑÑÐÐÑÑÐÐÑÐ ÑÐ ÐÑÐÐ ÐÑÐÐÑÑÐÐÐ ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ [!noauto]"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:13
+#: ../data/ui/edit-crypttab-dialog.ui.h:14
 msgid "Require additional authori_zation to unlock"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐÐÐÐ ÑÐ_ÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÐÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:14
+#: ../data/ui/edit-crypttab-dialog.ui.h:15
 msgid ""
 "If checked, additional authorization is required to unlock the device [x-"
 "udisks-auth]"
@@ -241,11 +587,12 @@ msgstr ""
 "ÐÐÐ ÐÑÐÐ ÐÐÐÑÐÐÐ, ÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐÐÑÐÐÐÑÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ "
 "ÑÑÑÑÐÐÑÑÐÐÑÐ [x-udisks-auth]"
 
-#: ../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>ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐ</big>"
+#: ../data/ui/edit-dos-partition-dialog.ui.h:1
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
+#: ../data/ui/edit-partition-dialog.ui.h:1
+#, fuzzy
+msgid "Edit Partition"
+msgstr "ÐÐÐ ÐÐ ÐÑÐÐâ"
 
 #: ../data/ui/edit-dos-partition-dialog.ui.h:3
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:3
@@ -271,7 +618,8 @@ msgstr ""
 "ÑÐÑÑÐÐÐ. ÐÑÐ Ñ ÑÐÐÐ ÑÐÐÐ ÑÐ ÐÐÑÐÑÐ ÐÑÐ <i>ÐÐÑÐÐÐÐ</i> ÐÑÐ."
 
 #: ../data/ui/edit-filesystem-dialog.ui.h:1
-msgid "<big>Change Filesystem Label</big>"
+#, fuzzy
+msgid "Change Filesystem Label"
 msgstr "<big>ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ</big>"
 
 #: ../data/ui/edit-filesystem-dialog.ui.h:3
@@ -279,10 +627,15 @@ msgid "_Label"
 msgstr "_ÐÑÐÐÐÑ"
 
 #: ../data/ui/edit-fstab-dialog.ui.h:1
+#, fuzzy
+msgid "Mount Options"
+msgstr "_ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐ"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:2
 msgid "_Automatic Mount Options"
 msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐ _ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:2
+#: ../data/ui/edit-fstab-dialog.ui.h:3
 msgid ""
 "Switch off <i>Automatic Mount Options</i> to manage mount point and mount "
 "options for the device. The options correspond to an entry in the <b>/etc/"
@@ -292,11 +645,11 @@ msgstr ""
 "ÐÐÑÑÑÐÐÐÐÑÐ Ð ÑÐÑÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ. ÐÐÑÑÑÐÐÐÐÑÐ ÑÐ ÐÐÐÐÐÐÐÑ "
 "ÐÑÐ ÑÐÐÐÐ <b>/etc/fstab</b>."
 
-#: ../data/ui/edit-fstab-dialog.ui.h:3
+#: ../data/ui/edit-fstab-dialog.ui.h:4
 msgid "I_dentify As"
 msgstr "_ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:4
+#: ../data/ui/edit-fstab-dialog.ui.h:5
 msgid ""
 "The <b>special device file</b> - use symlinks in the <b>/dev/disk</b> "
 "hierarchy to control the scope of the entry"
@@ -304,7 +657,7 @@ msgstr ""
 "<b>ÐÐÐÐÑÑ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ</b> â ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐ ÐÑÑÐÐÐ Ð ÐÐÐÐÐÑÐ <b>/"
 "dev/disk</b> ÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:5
+#: ../data/ui/edit-fstab-dialog.ui.h:6
 msgid ""
 "The special device file - use symlinks in the /dev/disk hierarchy to control "
 "the scope of the entry"
@@ -312,38 +665,38 @@ msgstr ""
 "ÐÐÐÐÑÑ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ â ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐ ÐÑÑÐÐÐ Ð ÐÐÐÐÐÑÐ /dev/disk "
 "ÐÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:6
+#: ../data/ui/edit-fstab-dialog.ui.h:7
 msgid "Mount _Point"
 msgstr "_ÐÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:7
+#: ../data/ui/edit-fstab-dialog.ui.h:8
 msgid "Filesystem _Type"
 msgstr "_ÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:8
+#: ../data/ui/edit-fstab-dialog.ui.h:9
 msgid "The directory to mount the device in"
 msgstr "ÐÐÐÐÐÑÐ, Ð ÐÐÑÑÐ ÐÐ ÑÐ ÐÐÐÑÐÑÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:9
+#: ../data/ui/edit-fstab-dialog.ui.h:10
 msgid "The filesystem type to use"
 msgstr "ÐÐÐÑÑ ÐÐ ÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐ, ÐÐÑÑÐ ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:10
+#: ../data/ui/edit-fstab-dialog.ui.h:11
 msgid "Display _Name"
 msgstr "_ÐÐÐÐÐÐÐÐÐ ÐÐÑÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:11
+#: ../data/ui/edit-fstab-dialog.ui.h:12
 msgid ""
 "If set, the name to use for the device in the user interface [x-gvfs-name=]"
 msgstr ""
 "ÐÐÐ Ð ÐÐÐÐÐÐÐÐ, ÑÐÐÐ Ð ÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ Ð ÐÐÑÑÐÐÐÑÐÐÑÐÐÑ ÐÐÑÐÑÑÐÐÑ [x-"
 "gvfs-name=]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:12
+#: ../data/ui/edit-fstab-dialog.ui.h:13
 msgid "Icon Na_me"
 msgstr "Ð_ÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:13
+#: ../data/ui/edit-fstab-dialog.ui.h:14
 msgid ""
 "If set, the name of the icon to use in the device in the user interface [x-"
 "gvfs-icon=]"
@@ -351,11 +704,11 @@ msgstr ""
 "ÐÐÐ Ð ÐÐÐÐÐÐÐÐ, ÑÐÐÐ Ð ÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÐÑÐÐÑÐÐÑ ÐÐÑÐÑÑÐÐÑ [x-gvfs-"
 "icon=]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:14
+#: ../data/ui/edit-fstab-dialog.ui.h:15
 msgid "Sho_w in user interface"
 msgstr "ÐÐÐÐ_ÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÑÐÐÑÐÐÑ ÐÐÑÐÑÑÐÐÑ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:15
+#: ../data/ui/edit-fstab-dialog.ui.h:16
 msgid ""
 "If checked, the device is always shown in the user interface no matter what "
 "its directory is [x-gvfs-show]"
@@ -363,11 +716,11 @@ msgstr ""
 "ÐÐÐ Ð ÐÐÐÐÐÐÐÐ, ÑÑÑÑÐÐÑÑÐÐÑÐ ÐÐÐÐÐÐ ÑÐ ÑÐ ÐÐÐÐÐÐÐ Ð ÐÐÑÑÐÐÐÑÐÐÑÐÐÑ "
 "ÐÐÑÐÑÑÐÐÑ, ÐÐÐ ÐÐÐÑÐÐÐÐ ÐÐÑ Ð ÐÐÐÐÐÑÐ ÐÑ [x-gvfs-show]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:16
+#: ../data/ui/edit-fstab-dialog.ui.h:17
 msgid "Require additional authori_zation to mount"
 msgstr "ÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐÑÐÐÐÐ ÑÐ_ÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:17
+#: ../data/ui/edit-fstab-dialog.ui.h:18
 msgid ""
 "If checked, additional authorization is required to mount the device [x-"
 "udisks-auth]"
@@ -375,20 +728,20 @@ msgstr ""
 "ÐÐÐ Ð ÐÐÐÐÐÐÐÐ, ÑÐ ÑÐ ÐÐÐÑÐÐÐ ÐÐÐÑÐÐÐÑÐÐÐÐ ÑÐÑÐÐÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐ "
 "ÑÑÑÑÐÐÑÑÐÐÑÐ [x-udisks-auth]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:18
+#: ../data/ui/edit-fstab-dialog.ui.h:19
 msgid "Mount at _startup"
 msgstr "ÐÐÐÑÐÑÐÐÐ ÐÑÐ _ÑÑÐÑÑÐÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:19
+#: ../data/ui/edit-fstab-dialog.ui.h:20
 msgid "If checked, the device will be mounted at startup [!noauto]"
 msgstr ""
 "ÐÐÐ Ð ÐÐÐÐÐÐÐÐ, ÑÑÑÑÐÐÑÑÐÐÑÐ ÑÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐÐ ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ [!noauto]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:20
+#: ../data/ui/edit-fstab-dialog.ui.h:21
 msgid "Mount Opt_ions"
 msgstr "_ÐÐÑÑÑÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:21
+#: ../data/ui/edit-fstab-dialog.ui.h:22
 msgid "The mount options stored in the <b>/etc/fstab</b> file"
 msgstr "ÐÐÑÑÑÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐÐ ÐÐÐÐÐÐÐÐ ÐÑÐ ÑÐÐÐÐ <b>/etc/fstab</b>"
 
@@ -509,282 +862,185 @@ msgstr ""
 msgid "Enter passphrase used to protect the data"
 msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../data/ui/format-disk-dialog.ui.h:1 ../data/ui/format-volume-dialog.ui.h:1
+#: ../data/ui/filesystem-create.ui.h:14 ../data/ui/format-disk-dialog.ui.h:4
+msgid "_Erase"
+msgstr ""
+
+#: ../data/ui/format-disk-dialog.ui.h:1
+#, fuzzy
+msgid "Format Disk"
+msgstr "ÐÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐâ"
+
+#: ../data/ui/format-disk-dialog.ui.h:2 ../data/ui/format-volume-dialog.ui.h:2
 msgid "_Format..."
 msgstr "_ÐÐÑÐÐÑÐÑÐÐÐâ"
 
-#: ../data/ui/format-disk-dialog.ui.h:2
-msgid "<big>Format Disk</big>"
-msgstr "<big>ÐÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ</big>"
-
 #: ../data/ui/format-disk-dialog.ui.h:3
 msgid "_Partitioning"
 msgstr "_ÐÐÐÐÐÐÑÐÐ"
 
-#: ../data/ui/format-volume-dialog.ui.h:2
-msgid "<big>Format Volume</big>"
+#: ../data/ui/format-volume-dialog.ui.h:1
+#, fuzzy
+msgid "Format Volume"
 msgstr "<big>ÐÐÑÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐ</big>"
 
-#: ../data/ui/palimpsest.ui.h:1
-msgid "Create a new partition..."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÐÑÐâ"
-
-#: ../data/ui/palimpsest.ui.h:2
-msgid "Mount the filesystem"
-msgstr "ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:3
-msgid "Unmount the filesystem"
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:4
-msgid "Eject the media"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑ"
-
-#: ../data/ui/palimpsest.ui.h:5
-msgid "Unlock the encrypted device"
-msgstr "ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:6
-msgid "Activate the swap space"
-msgstr "ÐÐÑÐÐÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÑ"
-
-#: ../data/ui/palimpsest.ui.h:7
-msgid "Deactivate the swap space"
-msgstr "ÐÐÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÑ"
-
-#: ../data/ui/palimpsest.ui.h:8
-msgid "Lock the encrypted device"
-msgstr "ÐÐÐÐÑÑÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:9
-msgid "More actions..."
-msgstr "ÐÑÑÐÐ ÐÐÐÑÑÐÐÑâ"
-
-#: ../data/ui/palimpsest.ui.h:10
-msgid "Delete partition..."
-msgstr "ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÑÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:11
-msgid "Format Disk..."
-msgstr "ÐÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐâ"
-
-#: ../data/ui/palimpsest.ui.h:12
-msgid "Create Disk Image..."
-msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:13
-msgid "Restore Disk Image..."
-msgstr "ÐÑÐÑÑÐÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:14
-msgid "View SMART Data..."
-msgstr "ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÑ S.M.A.R.T.â"
-
-#: ../data/ui/palimpsest.ui.h:15
-msgid "Format..."
-msgstr "ÐÐÑÐÐÑÐÑÐÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:16
-msgid "Edit Partition Type..."
-msgstr "ÐÐÐ ÐÐ ÐÑÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:17
-msgid "Edit Filesystem Label..."
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:18
-msgid "Change Passphrase..."
-msgstr "ÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐâ"
-
-#: ../data/ui/palimpsest.ui.h:19
-msgid "Edit Mount Options..."
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:20
-msgid "Edit Encryption Options..."
-msgstr "ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐ ÑÐÑÑÐÑÐÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:21
-msgid "Attach Disk Image..."
-msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:22
-msgid "Detach Disk Image"
-msgstr "ÐÑÐÐÑÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:23
-msgid "Select a device"
-msgstr "ÐÐÐÐÑÐÑÐ ÑÑÑÑÐÐÑÑÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:24
-msgid "Model"
-msgstr "ÐÐÐÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:25
-msgid "Serial Number"
-msgstr "ÐÐÑÐÐÐ ÐÐÐÐÑ"
-
-#: ../data/ui/palimpsest.ui.h:26
-msgid "World Wide Name"
-msgstr "ÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐÐÐ (WWN)"
-
-#: ../data/ui/palimpsest.ui.h:27
-msgid "Media"
-msgstr "ÐÐÑÐÑÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:28
-msgid "Size"
-msgstr "ÐÐÐÐÐÑ"
-
-#. 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 "ÐÑÐÐÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:30
-msgid "Eject media"
-msgstr "ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑ"
-
-#: ../data/ui/palimpsest.ui.h:31
-msgid "<b>_Volumes</b>"
-msgstr "<big>_ÐÐÐÐÐÐ</big>"
-
-#. 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 "ÐÑÐÑÑÐÐÐÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:34
-msgid "Device"
-msgstr "ÐÑÑÑÐÐÑÑÐÐ"
-
-# ÐÐÐÐÐÐÐÐ ÑÐ Ð ÐÐÐÑÐÐÑÑ Ñ ÐÑÑÐÐ ÐÐÐÐÐÐ â No; Yes; Yes, mounted in.
-# ÐÑÐÐÐÐÐÐÐÐ: ÐÐÐÐÐÐÐÐ ÑÐ
-# ÐÑÐÐÐÐÐÐÐÐ: ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ
-# ÐÑÐÐÐÐÐÐÐÐ: ÐÐÐÑÐÑÐÐÐ Ð
-#: ../data/ui/palimpsest.ui.h:35
-msgid "In Use"
-msgstr "ÐÑÐÐÐÐÐÐÐÐ"
-
-#: ../data/ui/palimpsest.ui.h:36
-msgid "Partition Type"
-msgstr "ÐÐÐ ÐÐ ÐÑÐÐ"
-
-#. 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 "ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÐÐÐ"
-
 #: ../data/ui/restore-disk-image-dialog.ui.h:1
-msgid "<big>Restore Disk Image</big>"
-msgstr "<big>ÐÑÐÑÑÐÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐ</big>"
-
-#: ../data/ui/restore-disk-image-dialog.ui.h:2
 msgid "_Image to restore"
 msgstr "_ÐÐÑÐÐ ÐÐ ÐÑÐÑÑÐÐÐÐÑÐÐÐÐ"
 
-#: ../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 "ÐÐÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐ ÐÐÑÐ, ÐÐÐÑÐ ÐÐ ÐÑÐÐ ÐÑÐÑÑÐÐÐÐÐÐ"
 
-#: ../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 "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ Ð ÑÑÑÑÐÐÑÑÐÐÑÐâ"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:5
+#: ../data/ui/restore-disk-image-dialog.ui.h:4
 msgid "_Start Restoring..."
 msgstr "_ÐÑÐÑÑÐÑÐÐÐ ÐÐ ÐÑÐÑÑÐÐÐÐÑÐÐÐÐÑÐâ"
 
 #: ../data/ui/smart-dialog.ui.h:1
+msgid "SMART Data"
+msgstr "ÐÐÐÐÐ ÐÑ S.M.A.R.T."
+
+#: ../data/ui/smart-dialog.ui.h:2
 msgid "_Start Self-test..."
 msgstr "Ð_ÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐâ"
 
-#: ../data/ui/smart-dialog.ui.h:2
+#: ../data/ui/smart-dialog.ui.h:3
 msgid "_Stop Self-test"
 msgstr "_ÐÐÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐÑÐ"
 
-#: ../data/ui/smart-dialog.ui.h:3
+#: ../data/ui/smart-dialog.ui.h:4
 msgid "Powered On"
 msgstr "Ð ÑÐÐÐÑÐÐ ÑÑÑÑÐÑÐÐÐ"
 
-#: ../data/ui/smart-dialog.ui.h:4
+#: ../data/ui/smart-dialog.ui.h:5
 msgid "Updated"
 msgstr "ÐÐÐÐÐÐÐ"
 
 #. 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:6 ../src/disks/gduatasmartdialog.c:284
+#: ../src/disks/gduatasmartdialog.c:503
 msgid "Temperature"
 msgstr "ÐÐÐÐÐÑÐÑÑÑÐ"
 
-#: ../data/ui/smart-dialog.ui.h:6
+#: ../data/ui/smart-dialog.ui.h:7
 msgid "Self-test Result"
 msgstr "ÐÐÐÑÐÑÐÑ ÐÑ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ"
 
-#: ../data/ui/smart-dialog.ui.h:7
+#: ../data/ui/smart-dialog.ui.h:8
 msgid "Self-assessment"
 msgstr "ÐÐÐÐÐÑÐÐÐÐ"
 
-#: ../data/ui/smart-dialog.ui.h:8
+#: ../data/ui/smart-dialog.ui.h:9
 msgid "Overall Assessment"
 msgstr "ÐÑÐÐÐ ÐÑÐÐÐÐ"
 
+#: ../data/ui/smart-dialog.ui.h:10
+msgid "SMART _Attributes"
+msgstr "_ÐÑÑÐÐÑÑÐ ÐÐ S.M.A.R.T."
+
 #. 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:11 ../src/disks/gduatasmartdialog.c:1491
 msgid "Value"
 msgstr "ÐÑÐÐÐÐÑÑ"
 
-#. 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 "ÐÐÐÐÐÐÐÐÐÑ"
-
-#. 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:12
 msgid "Type"
 msgstr "ÐÐÐ"
 
 #: ../data/ui/smart-dialog.ui.h:13
-msgid "Normalized"
-msgstr "ÐÐÑÐÐÐÐÐÐÑÐÐÐ"
-
-#: ../data/ui/smart-dialog.ui.h:14
-msgid "<b>SMART _Attributes</b>"
-msgstr "<b>_ÐÑÑÐÐÑÑÐ ÐÐ S.M.A.R.T.</b>"
+msgid "Description"
+msgstr "ÐÐÐÑÐÐÐÐ"
 
 # ÐÐÐÑÐÐÑÑÑÑ Ð SMART self-test => ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ 
-#: ../data/ui/smart-dialog.ui.h:15
+#: ../data/ui/smart-dialog.ui.h:14
 msgid "Short"
 msgstr "ÐÑÐÑÐÐ"
 
-#: ../data/ui/smart-dialog.ui.h:16
+#: ../data/ui/smart-dialog.ui.h:15
 msgid "Extended"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐ"
 
-#: ../data/ui/smart-dialog.ui.h:17
+#: ../data/ui/smart-dialog.ui.h:16
 msgid "Conveyance"
 msgstr "ÐÑÐÐÑÐÐÑÑÐÐ"
 
 #: ../data/ui/unlock-device-dialog.ui.h:1
-msgid "<big>Enter passphrase to unlock</big>"
+#, fuzzy
+msgid "Enter passphrase to unlock"
 msgstr "<big>ÐÑÐÐÐÐÑÐ ÐÐÑÐÐÐ, ÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÑÑÐÐÐ</big>"
 
 #: ../data/ui/unlock-device-dialog.ui.h:4
 msgid "_Unlock"
 msgstr "_ÐÑÐÐÑÑÐÐÐÐ"
 
+#: ../src/disk-image-mounter/main.c:44
+msgid "An error occurred"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:65
+msgid "Allow writing to the image"
+msgstr "ÐÐÐÑÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÑÐ ÑÐÐÐÐ Ñ ÐÐÑÐÐÐ"
+
+#: ../src/disk-image-mounter/main.c:80
+msgid "Select Disk Image(s) to Mount"
+msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ, ÐÐÐÑÐ ÐÐ ÐÑÐÐÑ ÐÐÐÑÐÑÐÐÐ"
+
+#: ../src/disk-image-mounter/main.c:84
+msgid "_Mount"
+msgstr "_ÐÐÐÑÐÑÐÐÐ"
+
+#. Add a RO check button that defaults to RO
+#: ../src/disk-image-mounter/main.c:90
+msgid "Set up _read-only mount"
+msgstr "ÐÐÐÑÐÑÐÐÐ Ð ÑÐÐÐÐ âÑÐÐÐ ÐÐ _ÑÐÑÐÐÐâ"
+
+#: ../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 ""
+"ÐÐÐ Ð ÐÐÐÑÐÐÐ, ÐÐÑÐÐÑÑ ÑÐ ÐÑÐÐ ÐÐÐÑÐÑÐÐ Ð ÑÐÐÐÐ âÑÐÐÐ ÐÐ ÑÐÑÐÐÐâ. ÐÐÐÐ ÐÐ ÑÐ "
+"ÐÐÐÐÐÐÐÐ, ÐÐÐ ÐÐ ÐÑÐÐÑÐ ÑÐÐÐÑÑ Ñ ÐÐÑÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÑÐ."
+
+#: ../src/disk-image-mounter/main.c:133
+#, c-format
+msgid "Error connecting to udisks daemon: %s (%s, %d)"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:141
+msgid "Attach and mount one or more disk image files."
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:189
+#, c-format
+msgid "Cannot open `%s' - maybe the volume isn't mounted?"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:196
+#, c-format
+msgid "Error opening `%s': %m"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÑÐÐ â%sâ: %m"
+
+#: ../src/disk-image-mounter/main.c:217
+#, c-format
+msgid "Error attaching disk image: %s (%s, %d)"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐ ÐÐÑÐ: %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 "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÑÐ ÑÐÑÐÐÐ"
 
-#: ../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"
@@ -796,44 +1052,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 "ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:154
+#: ../src/disks/gduatasmartdialog.c:138
 msgid "Average efficiency of the disk"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÐÐÑÐÐ"
 
 #. 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 "ÐÑÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:162
+#: ../src/disks/gduatasmartdialog.c:146
 msgid "Time needed to spin up the disk"
 msgstr "ÐÐÐÐÑÐÐÐÐÐ ÐÑÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐ"
 
 #. 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 "ÐÑÐÐ ÐÑÑÐÐÐÐÑ/ÑÐÐÑÐÐÐÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:170
+#: ../src/disks/gduatasmartdialog.c:154
 msgid "Number of spindle start/stop cycles"
 msgstr "ÐÑÐÐ ÑÐÐÐÐ ÐÐ ÐÑÑÐÐÐÐ/ÑÐÐÑÐÐÐ ÐÐ ÐÑÑÐ"
 
 #. 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 "ÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐÐÑÐÑÐ"
 
-#: ../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 "
@@ -846,101 +1102,99 @@ 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 "ÐÐÐÑÑÐ ÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:188
+#: ../src/disks/gduatasmartdialog.c:172
 msgid "Margin of a channel while reading data."
 msgstr "ÐÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐ ÐÑÐ ÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ."
 
 #. 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 "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÑÐ ÑÑÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:196
+#: ../src/disks/gduatasmartdialog.c:180
 msgid "Frequency of errors while positioning"
 msgstr "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ"
 
 #. 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 "ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÐÑÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:204
+#: ../src/disks/gduatasmartdialog.c:188
 msgid "Average efficiency of operations while positioning"
 msgstr "ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÐÐÐÑÑÐÐÑÑÐ ÐÑÐ ÐÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ"
 
 #. 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 "ÐÐÑÐÐÐ Ð ÑÐÐÐÑÐÐ ÑÑÑÑÐÑÐÐÐ"
 
-#: ../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 "ÐÑÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑÐ ÑÐÑÐÐÐ Ð ÑÐÐÐÑÐÐ ÑÑÑÑÐÑÐÐÐ"
 
 #. 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 "ÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐ ÐÐ ÑÐÐÐÑÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:220
+#: ../src/disks/gduatasmartdialog.c:204
 msgid "Number of retry attempts to spin up"
 msgstr "ÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐÐÑÐ ÐÐÐÑÐ ÐÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐ"
 
 #. 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 "ÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:228
+#: ../src/disks/gduatasmartdialog.c:212
 msgid "Number of attempts to calibrate the device"
 msgstr "ÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
 #. 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 "ÐÑÐÐ ÑÐÐÐÐ ÐÐ ÐÑÑÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:236
+#: ../src/disks/gduatasmartdialog.c:220
 msgid "Number of power-on events"
 msgstr "ÐÑÐÐ ÐÑÑÐÐÐÐÑ ÐÐ ÐÐÑÐÐ"
 
 #. 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 "ÐÐÑÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:245
+#: ../src/disks/gduatasmartdialog.c:229
 msgid "Frequency of errors while reading from the disk"
 msgstr "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ ÐÑ ÐÐÑÐÐ"
 
 #. 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 "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:253
+#: ../src/disks/gduatasmartdialog.c:237
 msgid "Number of errors that could not be recovered using hardware ECC"
 msgstr ""
 "ÐÑÐÐ ÐÑÐÑÐÐ, ÐÐÐÑÐ ÐÐ ÐÐÐÐÑ ÐÐ ÐÑÐÐÑ ÐÑÑÑÑÐÐÐÐÐ ÑÑÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐ ÐÐ "
@@ -949,11 +1203,11 @@ msgstr ""
 #. 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 "ÐÐÐÐÑÐ ÐÑ ÐÐÐÐÑÐÐÐÐÐ ÑÐÐÑÑÐÑÐÐÐ"
 
-#: ../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 ""
@@ -963,63 +1217,60 @@ 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 "ÐÐÐÐÐÑÐÑÑÑÐ ÐÐ ÐÑÐÐÑÑÐÐÑ ÐÐÑÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:269
+#: ../src/disks/gduatasmartdialog.c:253
 msgid "Airflow temperature of the drive"
 msgstr "ÐÐÐÐÐÑÐÑÑÑÐ ÐÐ ÐÑÐÐÑÑÐÐÑ ÐÐÑÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
 #. 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 "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÑÐ ÑÐÐÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:277
+#: ../src/disks/gduatasmartdialog.c:261
 msgid "Frequency of mistakes as a result of impact loads"
 msgstr "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐ Ð ÑÐÐÑÐÑÐÑ ÐÐ ÑÐÐÑÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐÐ ÐÐÐÑÐÑÐÐ"
 
 #. 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 "ÐÑÐÐ ÐÑÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:285
+#: ../src/disks/gduatasmartdialog.c:269
 msgid "Number of power-off or emergency retract cycles"
 msgstr "ÐÑÐÐ ÐÐ ÐÐÐÑÐÐÐÐÑÐ ÐÑÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐ"
 
 #. 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 "ÐÑÐÐ ÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐÐÐÐ/ÑÐÐÑÐÐÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:293
+#: ../src/disks/gduatasmartdialog.c:277
 msgid "Number of cycles into landing zone position"
 msgstr ""
 "ÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐ ÐÐÑÑÐÐÑÐÐ ÐÐ ÐÐÐÐÐÑÐ Ð ÐÐÐÐÐÐÑÐÐÑÐ ÐÑÐÑÑÑÐÐÑÑÐÐ ÐÐ ÐÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:301
+#: ../src/disks/gduatasmartdialog.c:285
 msgid "Current internal temperature of the drive"
 msgstr "ÐÐÐÑÑÐ ÐÑÑÑÐÑÐÐ ÑÐÐÐÐÑÐÑÑÑÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
 #. 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 "ÐÐÐÑÐÑÐÐ ÐÑÑÑÑÐÐÐÐÐ ÐÑÐÑÐÐ (ECC)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:309
+#: ../src/disks/gduatasmartdialog.c:293
 msgid "Number of ECC on-the-fly errors"
 msgstr ""
 "ÐÑÐÐ ÐÐ ÐÐÐÑÐÑÐÐ ÐÑÐÑÐÑÐÑÐ ÐÑÐÑÐÐ (ECC) Ð ÐÑÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ"
@@ -1027,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:316
+#: ../src/disks/gduatasmartdialog.c:300
 msgid "Reallocation Count"
 msgstr "ÐÑÐÐ ÐÐÐÑÐ ÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÐÐÑÐÐ"
 
-#: ../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 "
@@ -1044,11 +1295,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 "ÐÑÐÐ ÐÐ ÑÐÐÐÑÐÑÐ ÑÐÐÑÐÑÐ"
 
-#: ../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 "
@@ -1063,11 +1314,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 "ÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐ"
 
-#: ../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 "
@@ -1080,11 +1331,11 @@ 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 "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÑ CRC ÐÑÐ ÑÐÐÐÐ UDMA"
 
-#: ../src/palimpsest/gduatasmartdialog.c:350
+#: ../src/disks/gduatasmartdialog.c:334
 msgid "Number of CRC errors during UDMA mode"
 msgstr ""
 "ÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐÑÐ ÐÑÐÑÐÐ ÑÑÐÐ ÑÐÐÐÐÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑ ÐÐ ÐÑÐÑÐÐ (CRC) ÐÑÐ "
@@ -1093,11 +1344,11 @@ msgstr ""
 #. 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 "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÑÐ ÐÐÐÐÑ"
 
-#: ../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"
@@ -1108,22 +1359,22 @@ 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 "ÐÐÑÑÐÑÐ ÐÐ ÐÑÐÐÑÐÐÐÐÑÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:366
+#: ../src/disks/gduatasmartdialog.c:350
 msgid "Number of off-track errors"
 msgstr "ÐÑÐÐ ÐÐ ÐÑÐÑÐÐÑÐ ÐÑÐÐÐÐÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐÐÑÐ ÐÑÑÐÑÐÐÑÐ"
 
 #. 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 "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:374
+#: ../src/disks/gduatasmartdialog.c:358
 msgid "Number of Data Address Mark (DAM) errors (or) vendor-specific"
 msgstr ""
 "ÐÑÐÐ ÐÑÐÑÐÐ ÑÐÑÑÐÐÐÐ Ñ ÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÑÐ ÐÐ ÐÐÐÐÐÑÐ (DAM) (ÐÐÐ) ÐÐÐÐÐ "
@@ -1132,88 +1383,88 @@ msgstr ""
 #. 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 "ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:382
+#: ../src/disks/gduatasmartdialog.c:366
 msgid "Number of ECC errors"
 msgstr "ÐÑÐÐ ÐÐ ÐÑÐÑÐÐÑÐ (ECC)"
 
 #. 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 "ÐÑÐÐÑÐÐÐÐ ÐÑÑÑÑÐÐÑÐÐÐÐ ÐÐ ÐÑÐÑÐÐ (ECC)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:390
+#: ../src/disks/gduatasmartdialog.c:374
 msgid "Number of errors corrected by software ECC"
 msgstr "ÐÑÐÐ ÐÑÐÑÐÐ ÐÑÑÑÑÐÐÐÐÐ ÐÑÐÐÑÐÐÐÐ ÑÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑ ÐÐ ÐÑÐÑÐÐ (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 "ÐÐÑÑÐÑÐ ÐÐ ÑÐÐÐÐÑÐ ÑÐÐÐÐÑÐÑÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:398
+#: ../src/disks/gduatasmartdialog.c:382
 msgid "Number of Thermal Asperity Rate errors"
 msgstr "ÐÑÐÐ ÐÑÐÑÐÐ ÐÑÐÐÐÐÐÐÐÐ ÐÑ ÑÐÐÐÐ ÑÐÐÐÐÑÐÑÑÑÐÐ ÐÑÐÐÐÐÐ"
 
 #. 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 "ÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:406
+#: ../src/disks/gduatasmartdialog.c:390
 msgid "Height of heads above the disk surface"
 msgstr "ÐÐÑÐÑÐÐÐÑÐ, ÐÐ ÐÐÑÑÐ ÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÐÑ ÐÐÐ ÐÐÐÑÑÑÐÐÑÑÑÐ ÐÐ ÐÐÑÐÐ."
 
 #. 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 "ÐÐÐÐÐÐ ÑÐÐÐÐÐ ÐÑÐ ÑÐÐÐÑÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:414
+#: ../src/disks/gduatasmartdialog.c:398
 msgid "Amount of high current used to spin up the drive"
 msgstr "ÐÑÐÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÐÐÑÐÐ."
 
 #. 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 "ÐÑÐÐ ÐÐÐÑÐ ÐÐ ÑÐÐÐÑÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:422
+#: ../src/disks/gduatasmartdialog.c:406
 msgid "Number of buzz routines to spin up the drive"
 msgstr "ÐÑÐÐ ÐÐÐÑÐ ÐÐ ÑÐÐÐÑÑÑÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
 #. 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 "ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÑÑÑÑÐÐÐ Ð ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:430
+#: ../src/disks/gduatasmartdialog.c:414
 msgid "Drive's seek performance during offline operations"
 msgstr "ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑ ÐÐ ÑÑÐÑÐÐÐ ÐÑÐ ÑÐÐÐÑÐ Ð ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐ"
 
 #. 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 "ÐÑÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../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"
@@ -1221,7 +1472,7 @@ msgstr ""
 "ÐÑÐÐÐÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ Ð ÐÑÐÐÐÐÐÐ Ð ÑÐÐÐÑÑÐÐÐ ÐÐ ÑÐÐÐÐ ÑÐÐÑ, ÐÐÐÐÐÐ ÐÐÐ "
 "ÑÐÐÐÐÑÐÑÑÑÐÐ ÐÑÐÐÐÐÐ"
 
-#: ../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 ""
@@ -1230,22 +1481,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 "ÐÐÐÐÑÐÐ ÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:455
+#: ../src/disks/gduatasmartdialog.c:439
 msgid "Number of hours in general operational state"
 msgstr "ÐÑÐÐ ÑÐÑÐÐÐ Ð ÐÑÐÐÐÐÐÑÐ ÑÐÐÐÑÐÐ ÑÑÑÑÐÑÐÐÐ"
 
 #. 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 "ÐÑÐÐ ÐÐÐÑÐÑÐÐ ÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐÐÐÐ/ÑÐÐÑÐÐÐÑÐÐÐÐ"
 
-#: ../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"
@@ -1256,67 +1507,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 "ÐÐÑÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐ ÑÑÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:472
+#: ../src/disks/gduatasmartdialog.c:456
 msgid "Load on drive caused by friction in mechanical parts of the store"
 msgstr "ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐÐÐ ÐÑ ÑÑÐÐÐÐ Ð ÐÐÑÐÐÐÑÐÐÑÐ ÐÐÑÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:480
+#: ../src/disks/gduatasmartdialog.c:464
 msgid "Total number of load cycles"
 msgstr "ÐÑÐÐÐ ÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐ ÐÐÑÐÐÐÐÐÐ"
 
 #. 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 "ÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:488
+#: ../src/disks/gduatasmartdialog.c:472
 msgid "General time for loading in a drive"
 msgstr "ÐÐÐÑÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÑÐÐ"
 
 #. 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 "ÐÐÐÑÐÑÐÐÐÑ ÐÐ ÑÑÐÐÐÐÐÐ ÐÐ ÐÑÑÑÑÑÐÑ ÐÐÐÐÐÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:496
+#: ../src/disks/gduatasmartdialog.c:480
 msgid "Quantity efforts of the rotating moment of a drive"
 msgstr "ÐÐÐÐÑÐÑÑÐÐÐÐ ÑÑÐÐÐÑ ÐÑÐ ÐÑÑÑÑÑÐÑ ÐÐÐÐÐÑ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:504
+#: ../src/disks/gduatasmartdialog.c:488
 msgid "Number of power-off retract events"
 msgstr "ÐÑÐÐ ÐÑÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÐÐÑÐ ÐÑÐ ÐÐÐÐÑÑÐÐÐÐ"
 
 #. 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 "ÐÐÐÐÐÑÑÐÐ ÐÐ ÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:512
+#: ../src/disks/gduatasmartdialog.c:496
 msgid "Amplitude of heads trembling (GMR-head) in running mode"
 msgstr "ÐÐÐÐÐÑÑÐÐÑÐ ÐÐ ÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ Ð ÑÐÐÐÑÐÐ ÑÑÑÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:520
+#: ../src/disks/gduatasmartdialog.c:504
 msgid "Temperature of the drive"
 msgstr "ÐÐÐÐÐÑÐÑÑÑÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
 #. 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 "ÐÑÑÐÑÑÑÐÐ ÑÑÑÐÐÑÐÐÐÑÑ"
 
-#: ../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"
@@ -1327,22 +1578,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 "ÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:545
+#: ../src/disks/gduatasmartdialog.c:529
 msgid "Number of uncorrectable ECC errors"
 msgstr "ÐÑÐÐ ÐÐÐÐÐÑÐÐÐÐÐ ÐÑÐÑÐÐ ÑÑÐÐ ÐÐÐ ÐÐ ÐÐÑÐÐÑÐÑ ÐÐ ÐÑÐÑÐÐ (ECC)"
 
 #. 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 "ÐÑÐÑÐÐÑÐÐÐÐ ÐÐ ÐÐÐÑÐÑÐ ÐÐÐÐÐÐÐ"
 
-#: ../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"
@@ -1352,95 +1603,46 @@ 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 "ÐÐÑÐÐÐ ÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:562
+#: ../src/disks/gduatasmartdialog.c:546
 msgid "Time while head is positioning"
 msgstr "ÐÑÐÐÐ, ÐÐ ÐÐÐÑÐ ÐÐÐÐÐÑÐ ÑÐ ÐÐÐÐÑÐÐÐÐÑÐ"
 
 #. 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 "ÐÐÐÑÐÑÐÐ ÑÐÑÐÐÐÑ ÐÑÐ ÐÑÐÑÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:570
+#: ../src/disks/gduatasmartdialog.c:554
 msgid "Number of errors while reading from a disk"
 msgstr "ÐÑÐÐ ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ ÐÑ ÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:630
-#: ../src/palimpsest/gduatasmartdialog.c:820
+#: ../src/disks/gduatasmartdialog.c:614
 #, c-format
 msgid "No description for attribute %d"
 msgstr "ÐÑÐÐ ÐÐÐÑÐÐÐÐ ÐÐ ÐÑÑÐÐÑÑÐ â%dâ"
 
 #. Translators: Shown in the treeview for a failing attribute
-#: ../src/palimpsest/gduatasmartdialog.c:681
+#: ../src/disks/gduatasmartdialog.c:665
 msgid "FAILING"
 msgstr "ÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐ"
 
 #. 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 "ÐÐÐÐÐÐÑÐ ÑÐ Ð Ð ÐÐÐÐÐÐÑÐ"
 
 # ÐÐÐÑÐÑÐÑ ÐÑ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ
-#: ../src/palimpsest/gduatasmartdialog.c:694
-msgid "OK"
-msgstr "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ"
-
-#. 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 ÐÐÐÐÐÐ"
-msgstr[1] "%.1f ÐÐÐÐÐÐ"
-
-#. 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 ÐÐÐ"
-msgstr[1] "%.1f ÐÐÐ"
-
-#. 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 ÑÐÑ"
-msgstr[1] "%.1f ÑÐÑÐ"
-
-#. 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 ÐÐÐÑÑÐ"
-msgstr[1] "%.1f ÐÐÐÑÑÐ"
-
-#. 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 ÑÐÐÑÐÐÐ"
-msgstr[1] "%.1f ÑÐÐÑÐÐÐ"
-
-#. 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 ÐÐÐÐÑÐÐÑÐÐÐ"
-msgstr[1] "%.1f ÐÐÐÐÑÐÐÑÐÐÐ"
+#: ../src/disks/gduatasmartdialog.c:678
+msgid "OK"
+msgstr "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:764
+#: ../src/disks/gduatasmartdialog.c:705
 #, c-format
 msgid "%d sector"
 msgid_plural "%d sectors"
@@ -1454,8 +1656,7 @@ msgstr[1] "%d ÑÐÐÑÐÑÐ"
 #. * 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
+#: ../src/disks/gduatasmartdialog.c:717 ../src/disks/gduatasmartdialog.c:929
 #, c-format
 msgid "%.0f C / %.0f F"
 msgstr "%.0fââ/%.0fââ"
@@ -1463,57 +1664,26 @@ msgstr "%.0fââ/%.0fââ"
 #. 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
+#: ../src/disks/gduatasmartdialog.c:728
 msgid "N/A"
 msgstr "ÐÐ Ð ÐÐÐÐÑÐÐ"
 
-#. 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 "ÐÐÑÑÐÐÑÑÑ Ð ÐÑÐÐÐÐÐ ÐÐ ÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐ 24 ÑÐÑÐ (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 "ÐÐÑÑÐÐÑÑÑ Ð ÐÑÐÐÐÐÐ ÐÐ ÐÑÑÐÑÑÐ ÐÐÑÐ (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 "ÐÑÐÐÐ ÐÑÑ ÐÐÐÐÑÐ ÑÐ ÑÑÐÐÑÐÑ ÐÐÐÐÐ (Online)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Not Online)" in English
+#. 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/palimpsest/gduatasmartdialog.c:853
-msgid "Only during off-line activities (Not Online)"
-msgstr "ÐÐÐÐ ÐÑÐ ÐÐÐÐÐÑÑÐ Ð ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐ (Not Online)"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:861
-msgid "Name"
-msgstr "ÐÐÐ"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:867
-msgid "Description"
-msgstr "ÐÐÐÑÐÐÐÐ"
-
-#: ../src/palimpsest/gduatasmartdialog.c:908
+#: ../src/disks/gduatasmartdialog.c:774
 #, c-format
-msgid "%d <span size=\"small\">(Worst:%d, Threshold: %d)</span>"
-msgstr "%d <span size=\"small\">(ÐÐÐ-ÐÐÑÐ: %d, ÐÑÐÐ: %d)</span>"
+msgid ""
+"%s <span size=\"small\">(Normalized: %d, Threshold: %d, Worst: %d)</span>"
+msgstr ""
+"%s <span size=\"small\">(ÐÐÑÐÐÐÐÐÐÑÐÐÐ: %d, ÐÑÐÐ: %d, ÐÐÐ-ÐÐÑÐ: %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>"
@@ -1523,7 +1693,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>"
@@ -1532,123 +1702,126 @@ msgstr ""
 
 #. Translators: Please keep "(Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:931
-msgid "Every time data is collected <span size=\"small\">(Online)</span>"
-msgstr "ÐÑÐÐÐ ÐÑÑ ÐÐ ÑÑÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ <span size=\"small\">(Online)</span>"
+#: ../src/disks/gduatasmartdialog.c:797
+msgid ""
+"Updated every time data is collected <span size=\"small\">(Online)</span>"
+msgstr ""
+"ÐÐÐÐÐÑÐÐÐÐ ÐÑÐÐÐ ÐÑÑ, ÐÐÐÐÑÐ ÑÐ ÑÑÐÐÑÐÑ ÐÐÐÐÐ <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 ""
-"ÐÐÐÐ ÐÑÐ ÐÐÐÐÐÑÑÐ Ð ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐ <span size=\"small\">(Not Online)</span>"
+"ÐÐÐÐÐÑÐÐÐÐ ÑÐÐÐ ÐÑÐ ÐÐÐÐÐÑÑÐ Ð ÐÐÑÐÐÐÐÐÐ ÑÐÐÐÐ <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 "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑÑÑÐ ÑÑÐÐÑÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:968
+#: ../src/disks/gduatasmartdialog.c:838
 msgctxt "smart-self-test-result"
 msgid "Last self-test was aborted"
 msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÐÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:972
+#: ../src/disks/gduatasmartdialog.c:842
 msgctxt "smart-self-test-result"
 msgid "Last self-test was interrupted"
 msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÑÐ ÐÑÐÐÑÑÐÐÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:976
+#: ../src/disks/gduatasmartdialog.c:846
 msgctxt "smart-self-test-result"
 msgid "Last self-test did not complete"
 msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐ Ð ÐÑÐÐÐÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:980
+#: ../src/disks/gduatasmartdialog.c:850
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed"
 msgstr "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑÑÑÐ ÐÐÑÑÐÐÑÐÐ"
 
 #. 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 "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑÑÑÐ ÐÐÑÑÐÐÑÐÐ (ÐÐÐÐÑÑÐÑÐÑÐÐ)"
 
 #. 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 "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑÑÑÐ ÐÐÑÑÐÐÑÐÐ (ÑÐÑÐÐÐÐÑÐÐÐÐÑÐ)"
 
 #. 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 "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑÑÑÐ ÐÐÑÑÐÐÑÐÐ (ÑÐÑÐÐÐ)"
 
 #. 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 "ÐÐÑÐÐÐÐÐÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ ÐÐÐÑÑÑÐ ÐÐÑÑÐÐÑÐÐ (ÑÐÐÐÑÐÑÐÐ ÐÐÐÑÐÐÐ)"
 
 #. 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 "ÐÐÐÑÑÑÐÐ ÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ â ÐÑÑÐÐÐÑ %dâ%%"
 
 #. 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 "ÐÐÐÐÑÐÐÐÐÐÐ (%s)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1034
+#: ../src/disks/gduatasmartdialog.c:905
 #, c-format
 msgid "%s ago"
 msgstr "ÐÑÐÐÐ %s"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1091
+#: ../src/disks/gduatasmartdialog.c:963
 msgid "SMART is not supported"
 msgstr "ÐÐ ÑÐ ÐÐÐÐÑÑÐÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ (S.M.A.R.T.)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1097
+#: ../src/disks/gduatasmartdialog.c:969
 msgid "SMART is not enabled"
 msgstr "ÐÐ Ð ÐÐÐÑÑÐÐÐ ÐÐÐÐÑÑÐÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ (S.M.A.R.T.)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1109
-#, c-format
-msgid "Self-test in progress â %d%% remaining"
-msgstr "ÐÐÐÑÑÑÐÐ ÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ â ÐÑÑÐÐÐÑ %dâ%%"
+#: ../src/disks/gduatasmartdialog.c:981
+msgid "Self-test in progress"
+msgstr "ÐÐÐÑÑÑÐÐ ÑÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ"
 
-#: ../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 "ÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÐÐ ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1155
+#: ../src/disks/gduatasmartdialog.c:1026
 msgid "SELF-TEST FAILED"
 msgstr "ÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÐ"
 
-#: ../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] "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ, ÐÐÐÐ ÐÑÑÐÐÑÑ Ð ÐÐÐÑÐ ÐÐÑÐÐÑÐ"
 msgstr[1] "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ, %d ÐÑÑÐÐÑÑÐ ÑÐ ÐÐÐÑÐ ÐÐÑÐÐÑÐ"
 
-#: ../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] "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ, %d ÐÐÑ ÑÐÐÑÐÑ"
 msgstr[1] "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ, %d ÐÐÑÐ ÑÐÐÑÐÑÐ"
 
-#: ../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"
@@ -1656,7 +1829,7 @@ msgstr[0] "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ, Ð ÐÐÐÐÐÐÑÐ ÐÐÐÐ ÐÑÑ
 msgstr[1] "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ, Ð ÐÐÐÐÐÐÑÐ %d ÐÑÑÐÐÑÑÐ ÑÐ ÐÐÐÐ ÐÐÐÑÐ ÐÐÑÐÐÑÐ"
 
 #. Otherwise, it's all honky dory
-#: ../src/palimpsest/gduatasmartdialog.c:1195
+#: ../src/disks/gduatasmartdialog.c:1066
 msgid "Disk is OK"
 msgstr "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ"
 
@@ -1664,61 +1837,217 @@ msgstr "Ð ÐÐÐÑÐ ÑÑÑÑÐÑÐÐÐ"
 #. * 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 "ÐÑÐÐÑÑ Ð ÐÑÐÐÐÐÐÑ"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1369
+#: ../src/disks/gduatasmartdialog.c:1240
 msgid "Threshold not exceeded"
 msgstr "ÐÑÐÐÑÑ ÐÐ Ð ÐÑÐÐÐÐÐÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1428
+#: ../src/disks/gduatasmartdialog.c:1299
 msgid "Error refreshing SMART data"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÐ ÐÑ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ (S.M.A.R.T)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1460
+#: ../src/disks/gduatasmartdialog.c:1331
 msgid "Error aborting SMART self-test"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ (S.M.A.R.T)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1479
+#: ../src/disks/gduatasmartdialog.c:1350
 msgid "Error starting SMART self-test"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐÐÐÐÑÑÐÐÐ (S.M.A.R.T)"
 
 #. 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 "ÐÐÐÐÐÐÐÐÐÐÐÐÐ"
 
 #. 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 "ÐÑÑÐÐÑÑ"
 
-#: ../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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../src/disks/gdubenchmarkdialog.c:655 ../src/disks/gdubenchmarkdialog.c:954
+#, c-format
+msgid "%d sample"
+msgid_plural "%d samples"
+msgstr[0] ""
+msgstr[1] ""
+
+#. 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)"
+
+#: ../src/disks/gdubenchmarkdialog.c:708
+msgctxt "benchmark-updated"
+msgid "No benchmark data available"
+msgstr "ÐÐÐÑÐÐÑ ÐÐÐÐÐ ÐÑ ÑÐÑÑÐÐÐ ÐÐ ÐÑÐÐÐÐÐÐÐÑÐÐÐÐÑÑ"
+
+#: ../src/disks/gdubenchmarkdialog.c:713
+msgctxt "benchmark-updated"
+msgid "Opening Device..."
+msgstr "ÐÑÐÐÑÑÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐâ"
+
+#: ../src/disks/gdubenchmarkdialog.c:717
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring transfer rate (%2.1f%% complete)..."
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:724
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring access time (%2.1f%% complete)..."
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:840
+msgctxt "benchmarking"
+msgid "An error occurred"
+msgstr ""
+
+#. 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 ÐÐ %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
+#, fuzzy, c-format
+msgctxt "benchmark-access-time"
+msgid "%.2f msec"
+msgstr "%.2f ÐÐÐÐÑÐÐÑÐÐÐ"
+
+#: ../src/disks/gdubenchmarkdialog.c:1264
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting size of device: %m"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ: %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1274
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting page size: %m\n"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐ ÑÑÑÐÐÐÑÐÑÐ: %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 "ÐÑÐÑÐÐ ÐÑÐ ÑÑÑÑÐÐÐ ÐÑÐ ÐÑÐÐÑÑÐÐÐÐ %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 ""
+"ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ ÐÐ %lld ÐÐÐÑÐ ÐÑÐ ÐÑÐÐÐÐÐÐÑÐ ÐÐÐÐÑ ÐÑ ÐÑÐÐÑÑÐÐÐÐ %lld"
+
+#: ../src/disks/gdubenchmarkdialog.c:1337
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %d MB from offset %lld"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ ÐÐ %d MB ÐÑ ÐÑÐÐÑÑÐÐÐÐ %lld"
+
+#: ../src/disks/gdubenchmarkdialog.c:1392
+#, c-format
+msgctxt "benchmarking"
+msgid "Error writing %lld bytes at offset %lld: %m"
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:1402
+#, c-format
+msgctxt "benchmarking"
+msgid "Expected to write %lld bytes, only wrote %lld: %m"
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:1412
+#, c-format
+msgctxt "benchmarking"
+msgid "Error syncing (at offset %lld): %m"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÑÐÐÐÐÐÑÐÐÐ (ÐÑÐ ÐÑÐÐÑÑÐÐÐÐ %lld): %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1452
+#, c-format
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld: %m"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÑÑÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÐÐ %lld:%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1464
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %lld bytes from offset %lld"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ ÐÐ %lld ÐÐÐÑÐ ÐÑ ÐÑÐÐÑÑÐÐÐÐ %lld"
+
+#: ../src/disks/gduchangepassphrasedialog.c:157
 msgid "Error updating /etc/crypttab"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ /etc/crypttab"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:190
+#: ../src/disks/gduchangepassphrasedialog.c:176
 msgid "Error changing passphrase"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐ"
 
-#: ../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 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÑÐÐÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:303
+#: ../src/disks/gduchangepassphrasedialog.c:289
 msgid "/etc/crypttab configuration data is malformed"
 msgstr "ÐÐÐÐÐÑÐ Ð /etc/crypttab ÑÐ ÐÐÐÑÐÐÐÐÐ"
 
-#: ../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"
@@ -1726,8 +2055,8 @@ msgstr ""
 "ÐÑÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐ ÑÑÑÑÐÐÑÑÐÐ ÑÐ ÐÐÐÐÐÐ Ð ÐÐÑÐÐÐÑÐ ÐÐÐÐÐÐÐÐÐÐ ÐÑ "
 "ÑÐÐÐÐ <i>/etc/crypttab</i>"
 
-#: ../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 "ÐÐÐÐÐÐÐÐÑÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 
@@ -1735,37 +2064,56 @@ msgstr "ÐÐÐÐÐÐÐÐÑÑÑÐ ÐÐ ÐÐÑÐÐÐÑÐ"
 #. *              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 "ÐÐÐÐ Ñ ÐÐÑÐÐ ÐÐ %s (%s).img"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:233
-#: ../src/palimpsest/gdurestorediskimagedialog.c:274
-msgid "Error writing to backup image"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÑÐÐÐÑÐ ÐÐÐÐÐ ÐÐ ÑÐÐÐÐ Ñ ÐÐÑÐÐ"
+#: ../src/disks/gducreatediskimagedialog.c:251
+msgid "Error writing to image"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐÐ Ñ ÐÐÑÐÐ"
+
+#. 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 ""
+
+#. 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 ""
 
-#: ../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 "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÐ ÐÑ ÐÑÐÐÑÑÐÐÐÐ %"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:381
-#: ../src/palimpsest/gdurestorediskimagedialog.c:541
-msgid "Error opening device"
-msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÑÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
-
-#: ../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 "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:446
+#: ../src/disks/gducreatediskimagedialog.c:442
+#: ../src/disks/gdurestorediskimagedialog.c:585
+msgid "Error opening device"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÑÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
+
+#: ../src/disks/gducreatediskimagedialog.c:488
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ ÑÐÐÐ Ñ ÐÐÐ â%sâ. ÐÐÐÐÐÑÐ ÐÐ ÐÐ ÐÐ ÐÐÐÐÐÐÑÐ?"
 
-#: ../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."
@@ -1773,120 +2121,143 @@ msgstr ""
 "ÐÐÑÐ ÑÑÑÐÑÑÐÑÐÐ ÑÐÐÐ Ñ ÑÐÐÐÐÐ ÐÐÐ Ð â%sâ. ÐÐÐÑÐÐÑÐ ÐÑ ÑÐ ÑÐÐÑÐÐÐ ÑÑÐÑÐÑÐ ÐÑ "
 "ÑÑÐÑÑÐÐÐÐÐ."
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:453
+#: ../src/disks/gducreatediskimagedialog.c:495
 msgid "_Replace"
 msgstr "_ÐÐÐÑÐÐ"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:495
+#: ../src/disks/gducreatediskimagedialog.c:538
 msgid "Error opening file for writing"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐ ÐÐ ÐÐÐÐÑ"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:564
+#: ../src/disks/gducreatediskimagedialog.c:589
+msgid "Copying data from device..."
+msgstr "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ ÐÑ ÑÑÑÑÐÐÑÑÐÐÑÐâ"
+
+#. 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 "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐ ÐÑ ÑÑÑÑÐÐÑÑÐÐ <i>%s</i>â"
+msgid "Create Disk Image (%s)"
+msgstr "ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐ ÐÑ â%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 "ÐÑÐÐÐÑÑÐÐÐ Ñ ÐÑÐÑÐÐ ÐÐÐÑÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
-#: ../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 "ÐÑÐÐÐÑÑÐÐÐ Ñ ÐÐÐÐÑÐÑÐ ÐÐÐÑÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
-#: ../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 "ÐÑÐÐÐÑÑÐÐÐ ÑÑÑ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÑ"
 
-#: ../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 "ÐÐÑÑÐÑÐÐÐ, ÑÑÐÐÐÑÑÐÐÐ ÑÑÑ ÑÐÑÑÐÐÐ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÑ"
 
-#: ../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 "ÐÐÑÑÐÐÐÑÐÐÑÐÐ"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:413
+#: ../src/disks/gducreatefilesystemwidget.c:404
 msgid "Enter filesystem type"
 msgstr "ÐÑÐÐÐÐÑÐ ÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
 #. Translators: this is the default name for the filesystem
-#: ../src/palimpsest/gducreatefilesystemwidget.c:456
+#: ../src/disks/gducreatefilesystemwidget.c:450
 msgid "New Volume"
 msgstr "ÐÐÐ ÑÐÐ"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:215
+#: ../src/disks/gducreatefilesystemwidget.c:489
+#: ../src/disks/gduformatdiskdialog.c:151
+msgid "Don't overwrite existing data"
+msgstr ""
+
+#: ../src/disks/gducreatefilesystemwidget.c:490
+#: ../src/disks/gduformatdiskdialog.c:152
+msgid "Quick"
+msgstr ""
+
+#: ../src/disks/gducreatefilesystemwidget.c:497
+#: ../src/disks/gduformatdiskdialog.c:162
+msgid "Overwrite existing data with zeroes"
+msgstr "ÐÐÐÐÑÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÑÑÑ ÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐ"
+
+#: ../src/disks/gducreatefilesystemwidget.c:498
+#: ../src/disks/gduformatdiskdialog.c:163
+msgid "Slow"
+msgstr ""
+
+#: ../src/disks/gducreatepartitiondialog.c:201
 msgid "Error formatting partition"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐ"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:242
+#: ../src/disks/gducreatepartitiondialog.c:229
 msgid "Error creating partition"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÑÐ"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:326
+#: ../src/disks/gducreatepartitiondialog.c:317
 msgid "Extended partition"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐ"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:327
+#: ../src/disks/gducreatepartitiondialog.c:318
 msgid "For logical partitions"
 msgstr "ÐÑÐÑÑÐÐ ÐÐÐÐÑÐÑÐÐ ÐÑÐÐÐÐ"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:340
+#: ../src/disks/gducreatepartitiondialog.c:331
 msgid ""
 "Cannot create a new partition. There are already four primary partitions."
 msgstr "ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐ ÐÑÐ. ÐÐÑÐ ÐÐÐ ÑÐÑÐÑÐ ÐÑÐÐÐÐÐ ÐÑÐÐ."
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:344
+#: ../src/disks/gducreatepartitiondialog.c:335
 msgid "This is the last primary partition that can be created."
 msgstr "ÐÐÐÐ Ð ÐÐÑÐÐÐÐÐÑÑ ÐÑÐÐÐÐÐ ÐÑÐ, ÐÐÐÑÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐ."
 
 # ÐÐÐÑÐÐÑÑÑÑ Ð ÐÐÑÐÐÐ.
-#: ../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 "ÐÐ ÐÑÐÐ ÑÑÐÐÐÐÐÐÐ"
 
 # ÐÐÐÑÐÐÑÑÑÑ Ð ÐÐÑÐÐÐ.
-#: ../src/palimpsest/gducrypttabdialog.c:124
-#: ../src/palimpsest/gducrypttabdialog.c:149
+#: ../src/disks/gducrypttabdialog.c:110 ../src/disks/gducrypttabdialog.c:135
 msgid "None"
 msgstr "ÐÐÐÑÐÐ"
 
 # ÐÐÐÑÐÐÑÑÑÑ Ð ÐÐÑÐÐÐ.
-#: ../src/palimpsest/gducrypttabdialog.c:151
+#: ../src/disks/gducrypttabdialog.c:137
 msgid "Will be deleted"
 msgstr "ÐÐ ÐÑÐÐ ÐÐÑÑÐÑÐ"
 
-#: ../src/palimpsest/gducrypttabdialog.c:278
+#: ../src/disks/gducrypttabdialog.c:263
 msgid "Error removing /etc/crypttab entry"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÑ ÐÑ /etc/crypttab"
 
-#: ../src/palimpsest/gducrypttabdialog.c:363
+#: ../src/disks/gducrypttabdialog.c:347
 msgid "Error adding /etc/crypttab entry"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑ Ð /etc/crypttab"
 
-#: ../src/palimpsest/gducrypttabdialog.c:386
+#: ../src/disks/gducrypttabdialog.c:370
 msgid "Error updating /etc/crypttab entry"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÑ Ð /etc/crypttab"
 
-#: ../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>"
@@ -1895,16 +2266,16 @@ msgstr ""
 "ÐÑÐÐÐÐÐÐÐ. ÐÐ ÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐÐÑÐ ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÑÐÐ, ÐÐÐÐÐÐÐÐÐÑÐ <i>ÐÐÑÐÐ "
 "ÐÐ ÐÐÑÐÐÐÑÐâ</i>"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:410
+#: ../src/disks/gdudevicetreemodel.c:533
 msgid "Disk Drives"
 msgstr "ÐÐÑÐÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:820
+#: ../src/disks/gdudevicetreemodel.c:942
 msgid "Other Devices"
 msgstr "ÐÑÑÐÐ ÑÑÑÑÐÐÑÑÐÐ"
 
 #. 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 "ÐÑÑÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ (loop device) (%s)"
@@ -1912,222 +2283,364 @@ msgstr "ÐÑÑÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ (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)"
 
-#: ../src/palimpsest/gdufilesystemdialog.c:74
+#: ../src/disks/gdudisksettingsdialog.c:264
+msgctxt "standby-value"
+msgid "Never"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:283
+msgctxt "standby-value"
+msgid "Vendor-defined"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:287
+msgctxt "standby-value"
+msgid "Reserved"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:308
+msgctxt "apm-level"
+msgid "255 (Disabled)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:312
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down permitted)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:316
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down not permitted)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:331
+msgctxt "aam-level"
+msgid "0 (Disabled)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:360
+msgid "Error setting configuration"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ"
+
+#. 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 ""
+
+#. 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 ÐÐÐÑÑÐ"
+
+#. 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 ÐÐÐÑÑÐ"
+
+#. 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 ÐÐÐÑÑÐ"
+
+#. 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 ÑÐÑÐ"
+
+#. 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 "ÐÐÐÑÑÑÐÐÐÐ ÐÐ ÐÐÐÑÐÐÑ"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../src/disks/gdufilesystemdialog.c:60
 msgid "Error setting label"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÑÐÐÐÑ"
 
-#: ../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 ""
+
+#. 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 ""
+
+#: ../src/disks/gduformatdiskdialog.c:195
+msgid "ATA Secure Erase"
+msgstr ""
+
+#: ../src/disks/gduformatdiskdialog.c:210
+msgid "ATA Enhanced Secure Erase"
+msgstr ""
+
+#: ../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 ""
 "ÐÑÐÐÐÑÑÐÐÐ ÑÑÑ ÑÑÐÑÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐÐ ÑÐÑÑÐÐÐ Ð ÑÐÑÑÐÐ ÐÐÑÐÐÐÐ Ñ ÐÐÐÐ ÐÐÐÐÑÐ "
 "ÐÑ 2âTB"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:139
+#: ../src/disks/gduformatdiskdialog.c:266
 msgid "GPT"
 msgstr "GTP"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:151
+#: ../src/disks/gduformatdiskdialog.c:283
 msgid "No partitioning"
 msgstr "ÐÐÐ ÑÐÐÐÐÐÑÐÐ"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:152
+#: ../src/disks/gduformatdiskdialog.c:284
 msgid "Empty"
 msgstr "ÐÐÐ"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:186
+#: ../src/disks/gduformatdiskdialog.c:328
 msgid "Error formatting disk"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:231
+#: ../src/disks/gduformatdiskdialog.c:385
 msgid "Are you sure you want to format the disk?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐ ÑÑÐ, ÑÐ ÐÑÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐÑÐÑÐ ÐÐÑÐÐ?"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:232
-#: ../src/palimpsest/gduformatvolumedialog.c:158
-msgid "All data on the volume will be lost"
-msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐ ÑÐ ÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
+#. 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 ""
+
+#: ../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 ""
+
+#. 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 ""
+
+#: ../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 ""
 
-#: ../src/palimpsest/gduformatdiskdialog.c:233
-#: ../src/palimpsest/gduformatvolumedialog.c:159
+#: ../src/disks/gduformatdiskdialog.c:411
+#: ../src/disks/gduformatvolumedialog.c:164
 msgid "_Format"
 msgstr "_ÐÐÑÐÐÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:100
+#: ../src/disks/gduformatvolumedialog.c:86
 msgid "Error formatting volume"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐ"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:157
+#: ../src/disks/gduformatvolumedialog.c:147
 msgid "Are you sure you want to format the volume?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐ ÑÑÐ, ÑÐ ÐÑÐÐÑÐ ÐÐ ÑÐÑÐÐÑÐÑÐÑÐ ÑÐÐÐ?"
 
-#: ../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 ""
+
+#. 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 ""
+
+#: ../src/disks/gdufstabdialog.c:152
 #, c-format
 msgid "Matches partition %d of the device with the given vital product data"
 msgstr "ÐÑÐÐÐÐÐ Ñ ÐÑÐ ââ%d ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ ÑÑÑ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../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 "ÐÑÐÐÐÐÐ Ñ ÐÑÐÑÐÐ ÐÑÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ ÑÑÑ ÐÐÐÐÐÐÐÐÑÐ ÐÐÐÐÐ"
 
-#: ../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 ""
 "ÐÑÐÐÐÐÐ Ñ ÐÑÐ ââ%d ÐÐ ÐÑÑÐÐ ÑÑÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÑ ÐÐÑÑ ÐÐÐ ÐÐÑÐÑ"
 
-#: ../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 "ÐÑÐÐÐÐÐ Ñ ÐÑÑÐÐ ÑÑÑÑÐÐÑÑÐÐ ÑÐÑÑÐÐÐÐ ÐÐ ÐÐÐÐÐÐÐÐÑ ÐÐÑÑ ÐÐÐ ÐÐÑÐÑ"
 
-#: ../src/palimpsest/gdufstabdialog.c:181
+#: ../src/disks/gdufstabdialog.c:167
 msgid "Matches any device with the given label"
 msgstr "ÐÑÐÐÐÐÐ Ñ ÐÑÑÐÐ ÑÑÑÑÐÐÑÑÐÐ ÑÑÑ ÐÐÐÐÐÐÐÐÑ ÐÑÐÐÐÑ"
 
-#: ../src/palimpsest/gdufstabdialog.c:185
+#: ../src/disks/gdufstabdialog.c:171
 msgid "Matches the device with the given UUID"
 msgstr "ÐÑÐÐÐÐÐ Ñ ÑÑÑÑÐÐÑÑÐÐÑÐ ÑÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐÐÐÑÐÑÐÐÐÑÐÑ (UUID)"
 
-#: ../src/palimpsest/gdufstabdialog.c:189
+#: ../src/disks/gdufstabdialog.c:175
 msgid "Matches the given device"
 msgstr "ÐÑÐÐÐÐÐ ÑÑÑ ÐÐÐÐÐÐÐÐÑÐ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: ../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 ""
 "ÐÑÐÐÐÐÐÐ Ð ÑÐÑÑÐÐÐÑÐ ÐÐ ÐÐ ÑÐÐÐÑÐ ÐÐÑÐÐÐÐÐ, ÐÐÐ ÑÐÐÐ ÐÐÐÐÑ ÐÑÐÐ ÐÑÐÐÐÐÐÐ ÐÐÐ "
 "ÐÑÐÐÐÑÐÐÑ."
 
-#: ../src/palimpsest/gdufstabdialog.c:532
+#: ../src/disks/gdufstabdialog.c:518
 msgid "Error removing old /etc/fstab entry"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐÐÐ ÐÐ ÐÑÑÐÑÑÐ ÐÐÐÐÑ ÐÑ /etc/fstab"
 
-#: ../src/palimpsest/gdufstabdialog.c:588
+#: ../src/disks/gdufstabdialog.c:574
 msgid "Error adding new /etc/fstab entry"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐ ÐÐ ÐÐÐ ÐÐÐÐÑ Ð /etc/fstab"
 
-#: ../src/palimpsest/gdufstabdialog.c:612
+#: ../src/disks/gdufstabdialog.c:598
 msgid "Error updating /etc/fstab entry"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÐÐ ÐÐ ÐÐÐÐÑ Ð /etc/fstab"
 
-#: ../src/palimpsest/gdupartitiondialog.c:369
+#: ../src/disks/gdupartitiondialog.c:355
 msgid "Error setting partition type"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ"
 
-#: ../src/palimpsest/gdupartitiondialog.c:383
+#: ../src/disks/gdupartitiondialog.c:369
 msgid "Error setting partition name"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐ ÐÐÐÑÐ ÐÐ ÐÑÐÐ"
 
-#: ../src/palimpsest/gdupartitiondialog.c:397
+#: ../src/disks/gdupartitiondialog.c:383
 msgid "Error setting partition flags"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÐÐÐÑÐ ÐÐ ÐÑÐÐ"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:169
+#: ../src/disks/gdupasswordstrengthwidget.c:126
+msgctxt "Password strength"
 msgid "Weak"
 msgstr "ÐÐÐÐÐ"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:170
+#: ../src/disks/gdupasswordstrengthwidget.c:127
+msgctxt "Password strength"
 msgid "Fair"
 msgstr "ÐÑÐÐÐÐÐÐÐ"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:171
+#: ../src/disks/gdupasswordstrengthwidget.c:128
+msgctxt "Password strength"
 msgid "Good"
 msgstr "ÐÐÐÑÐ"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:172
+#: ../src/disks/gdupasswordstrengthwidget.c:129
+msgctxt "Password strength"
 msgid "Strong"
 msgstr "ÐÐÐÐÐ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:167
+#: ../src/disks/gdurestorediskimagedialog.c:126
+msgid "Error rescanning device"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐ ÐÑÐÐÐÑÑÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
+
+#: ../src/disks/gdurestorediskimagedialog.c:185
 msgid "Cannot restore image of size 0"
 msgstr "ÐÐ ÐÐÐÐ ÐÐ ÐÑÐÐ ÐÑÐÑÑÐÐÐÐÐÐ ÐÐÑÐÐ Ñ ÑÐÐÐÐÑ 0"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:176
+#: ../src/disks/gdurestorediskimagedialog.c:194
 #, c-format
 msgid "The selected image is %s smaller than the device"
 msgstr "ÐÐÐÑÐÐÐÑÑ ÐÐÑÐÐ Ð Ñ %s ÐÐ-ÐÐÐÑÐ ÐÑ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:185
+#: ../src/disks/gdurestorediskimagedialog.c:203
 #, c-format
 msgid "The selected image is %s bigger than the device"
 msgstr "ÐÐÐÑÐÐÐÑÑ ÐÐÑÐÐ Ð Ñ %s ÐÐ-ÐÐÐÑÐ ÐÑ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:416
+#: ../src/disks/gdurestorediskimagedialog.c:292
+msgid "Error writing to device"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑ Ð ÑÑÑÑÐÐÑÑÐÐÑÐ"
+
+#: ../src/disks/gdurestorediskimagedialog.c:443
 msgid "Error opening file for reading"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐ ÐÐ ÑÐÑÐÐÐ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:430
+#: ../src/disks/gdurestorediskimagedialog.c:457
 msgid "Error determing size of file"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÐÐÑÐÐ ÐÐ ÑÐÐÐÐÑÐ ÐÐ ÑÐÐÐÐ"
 
-#: ../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 "ÐÐÐÑÑÐÐ ÐÐ ÑÑÐ, ÑÐ ÐÑÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÐ ÑÐÐÐÐ Ñ ÐÐÑÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ?"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:496
+#: ../src/disks/gdurestorediskimagedialog.c:488
 msgid "All existing data will be lost"
 msgstr "ÐÑÐÑÐÐ ÐÐÐÐÑÐÐ ÐÐÐÐÐ ÑÐ ÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:497
+#: ../src/disks/gdurestorediskimagedialog.c:489
 msgid "_Restore"
 msgstr "_ÐÑÐÑÑÐÐÐÐÑÐÐÐÐ"
 
-#: ../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 "ÐÐÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐ Ð ÑÑÑÑÐÐÑÑÐÐ <i>%s</i>â"
+msgid "Restore Disk Image (%s)"
+msgstr "ÐÑÐÑÑÐÐÐÐÑÐÐÐÐ ÐÐ ÑÐÐÐ Ñ ÐÐÑÐÐ ÐÐ â%sâ"
 
-#: ../src/palimpsest/gduunlockdialog.c:50
+#: ../src/disks/gduunlockdialog.c:86
 msgid "Error unlocking encrypted device"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÑÑÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐ ÑÑÑÑÐÐÑÑÐÐ"
 
-#: ../src/palimpsest/gduutils.c:81
-msgid "All Files"
-msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÐ"
-
-#: ../src/palimpsest/gduutils.c:85
-msgid "Disk Images (*.img, *.iso)"
-msgstr "ÐÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ â *.img, *.iso"
-
-#: ../src/palimpsest/gduutils.c:105
-#, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ÑÐÐÑÐÐÐ"
-msgstr[1] "%d ÑÐÐÑÐÐÐ"
-
-#: ../src/palimpsest/gduutils.c:112
-msgid "Less than a minute"
-msgstr "ÐÐ-ÐÐÐÐÐ ÐÑ ÐÐÐÑÑÐ"
-
-#: ../src/palimpsest/gduutils.c:118
-#, c-format
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d ÐÐÐÑÑa"
-msgstr[1] "%d ÐÐÐÑÑÐ"
-
-#: ../src/palimpsest/gduutils.c:126
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ÑÐÑ"
-msgstr[1] "%d ÑÐÑÐ"
+#: ../src/disks/gduunlockdialog.c:143
+msgid "The encryption passphrase was retrieved from the keyring"
+msgstr ""
 
 #. 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"
@@ -2136,60 +2649,60 @@ msgstr "ÐÑÐ %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 "ÐÑÐ %d"
 
-#: ../src/palimpsest/gduvolumegrid.c:1563
+#: ../src/disks/gduvolumegrid.c:1552
 msgid "No Media"
 msgstr "ÐÐÐÑÐÐ ÐÐÑÐÑÐÐ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1580
+#: ../src/disks/gduvolumegrid.c:1569
 msgctxt "volume-grid"
 msgid "Free Space"
 msgstr "ÐÐÐÐÐÐÐÐÑÐ ÐÑÐÑÑÑÐÐÑÑÐÐ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1622
+#: ../src/disks/gduvolumegrid.c:1611
 msgctxt "volume-grid"
 msgid "Extended Partition"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1646
+#: ../src/disks/gduvolumegrid.c:1635
 msgctxt "volume-grid"
 msgid "Filesystem"
 msgstr "ÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1665
+#: ../src/disks/gduvolumegrid.c:1653
 msgctxt "volume-grid"
 msgid "Swap"
 msgstr "ÐÐÑÑÑÐÐÐÐ ÐÐÐÐÑ"
 
-#: ../src/palimpsest/gduwindow.c:531
+#: ../src/disks/gduwindow.c:612
 msgid "Error deleting loop device"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ ÐÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ (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 "ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÐÐ ÐÐ ÐÐÑÐÐ ÐÐ ÐÐÑÐ"
 
-#: ../src/palimpsest/gduwindow.c:642
+#: ../src/disks/gduwindow.c:723
 msgid "Select Disk Image to Attach"
 msgstr "ÐÐÐÐÑÐÑÐ ÑÐÐÐ Ñ ÐÐÑÐÐ, ÐÐÐÑÐ ÐÐ ÐÑÐÐ ÐÐÐÐÑÐÐ"
 
-#: ../src/palimpsest/gduwindow.c:646
+#: ../src/disks/gduwindow.c:727
 msgid "_Attach"
 msgstr "_ÐÐÐÐÑÐÐÐ"
 
 #. 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 ""
 "ÐÐÑÑÑÐÐÐÐÐÐ ÐÐ ÑÑÑÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ (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"
@@ -2199,28 +2712,49 @@ msgstr ""
 "ÐÐÑÐÐ ÐÐ ÐÑÐÐ ÐÑÐÐÐÐÑÐ."
 
 #. 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\">(ÑÐÐÐ ÐÐ ÑÐÑÐÐÐ)</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 ""
+
+#: ../src/disks/gduwindow.c:1736
+#, c-format
+msgctxt "job-remaining"
+msgid "%s remaining"
+msgstr ""
+
+#. 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 ""
+
+#: ../src/disks/gduwindow.c:2193
 msgctxt "partition type"
 msgid "Unknown"
 msgstr "ÐÐÐÐÐÐÑÑÐÐ"
 
-#: ../src/palimpsest/gduwindow.c:1849
+#: ../src/disks/gduwindow.c:2225
 msgid "Extended Partition"
 msgstr "ÐÐÐÑÐÑÐÐ ÐÑÐ"
 
 #. 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 "ÐÐÑÐÐÐÐÐ ÐÐÐÐÐ ÐÐ ÑÐÐÐÐÐÐÑÐ ÑÐÑÑÐÐÐ"
 
 #. 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 "ÐÐÐÑÐÑÐÐÐ Ð %s"
@@ -2228,66 +2762,212 @@ msgstr "ÐÐÐÑÐÑÐÐÐ Ð %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 "ÐÐ ÑÐ ÐÐÐÐÐÐÐÐ"
 
 #. 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 "ÐÐÐÐÐÐÐÐ ÑÐ"
 
 #. 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 "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÑÑÐÐ (%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 "ÐÐÐÐÐÐÐÐÐÐ ÐÑÐÑÑÑÐÐÑÑÐÐ"
 
-#: ../src/palimpsest/gduwindow.c:2400
+#: ../src/disks/gduwindow.c:2764
+msgid "An error occurred when trying to put the drive into standby mode"
+msgstr ""
+
+#: ../src/disks/gduwindow.c:2810
+msgid "An error occurred when trying to wake up the drive from standby mode"
+msgstr ""
+
+#: ../src/disks/gduwindow.c:2885
 msgid "Error mounting filesystem"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduwindow.c:2440
+#: ../src/disks/gduwindow.c:2925
 msgid "Error unmounting filesystem"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÑÐÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduwindow.c:2519
+#: ../src/disks/gduwindow.c:3006
 msgid "Error deleting partition"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÑÐÐÐÐÐ ÐÐ ÐÑÐ"
 
-#: ../src/palimpsest/gduwindow.c:2535
+#: ../src/disks/gduwindow.c:3022
 msgid "Are you sure you want to delete the partition?"
 msgstr "ÐÐÐÑÑÐÐ ÐÐ ÑÑÐ, ÑÐ ÐÑÐÐÑÐ ÐÐ ÐÐÑÑÐÐÑÐ ÐÑÐÐ?"
 
-#: ../src/palimpsest/gduwindow.c:2536
+#: ../src/disks/gduwindow.c:3023
 msgid "All data on the partition will be lost"
 msgstr "ÐÑÐÑÐÐ ÐÐÐÐÐ ÐÐ ÐÑÐÐ ÑÐ ÐÑÐÐÑ ÐÐÐÑÐÐÐÐ"
 
-#: ../src/palimpsest/gduwindow.c:2537
+#: ../src/disks/gduwindow.c:3024
 msgid "_Delete"
 msgstr "_ÐÐÑÑÐÐÐÐÐ"
 
-#: ../src/palimpsest/gduwindow.c:2568
+#: ../src/disks/gduwindow.c:3055
 msgid "Error ejecting media"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐÐ ÐÐ ÐÐÑÐÑÐÐÑ"
 
-#: ../src/palimpsest/gduwindow.c:2620
+#: ../src/disks/gduwindow.c:3107
 msgid "Error locking encrypted device"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÑÑÐÐÐÐ ÐÐ ÑÐÑÑÐÑÐÐÐ ÑÑÑÑÐÐÑÑÐÐÑÐ"
 
-#: ../src/palimpsest/gduwindow.c:2661
+#: ../src/disks/gduwindow.c:3148
 msgid "Error starting swap"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÑ"
 
-#: ../src/palimpsest/gduwindow.c:2698
+#: ../src/disks/gduwindow.c:3185
 msgid "Error stopping swap"
 msgstr "ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÐÐÐ ÐÐ ÐÐÑÑÑÐÐÐÐÑÐ ÐÐÐÐÑ"
+
+#: ../src/disks/gduwindow.c:3227
+msgid "Error setting autoclear flag"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÐÐÐ ÑÐÐÐÐ ÐÐ ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÑÐÑÑÐÐÐÐ (autoclear)"
+
+#: ../src/disks/gduwindow.c:3280 ../src/disks/gduwindow.c:3335
+msgid "Error canceling job"
+msgstr "ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÑÐ"
+
+#: ../src/libgdu/gduutils.c:86
+msgid "All Files"
+msgstr "ÐÑÐÑÐÐ ÑÐÐÐÐÐÐ"
+
+#: ../src/libgdu/gduutils.c:90
+msgid "Disk Images (*.img, *.iso)"
+msgstr "ÐÐÐÐÐÐÐ Ñ ÐÐÑÐÐÐ â *.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 ÐÐÐÐÐÐ"
+msgstr[1] "%d ÐÐÐÐÐÐ"
+
+#. Translators: Used for number of months
+#: ../src/libgdu/gduutils.c:410
+#, c-format
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d ÐÐÑÐÑ"
+msgstr[1] "%d ÐÐÑÐÑÐ"
+
+#. Translators: Used for number of days
+#: ../src/libgdu/gduutils.c:417
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d ÐÐÐ"
+msgstr[1] "%d ÐÐÐ"
+
+#. Translators: Used for number of hours
+#: ../src/libgdu/gduutils.c:424
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d ÑÐÑ"
+msgstr[1] "%d ÑÐÑÐ"
+
+#. Translators: Used for number of minutes
+#: ../src/libgdu/gduutils.c:431
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ÐÐÐÑÑa"
+msgstr[1] "%d ÐÐÐÑÑÐ"
+
+#. Translators: Used for number of seconds
+#: ../src/libgdu/gduutils.c:438
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ÑÐÐÑÐÐÐ"
+msgstr[1] "%d ÑÐÐÑÐÐÐ"
+
+#. 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 ÐÐÐÐÑÐÐÑÐÐÐ"
+msgstr[1] "%d ÐÐÐÐÑÐÐÑÐÐÐ"
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: ../src/libgdu/gduutils.c:544
+msgctxt "duration"
+msgid "Less than a minute"
+msgstr "ÐÐ-ÐÐÐÐÐ ÐÑ ÐÐÐÑÑÐ"
+
+#. 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 ""
+
+#. 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 ""
+
+#~ msgid "<big>Change Passphrase</big>"
+#~ msgstr "<big>ÐÐÑÐÐ ÐÐ ÐÐÑÐÐÐÑÐ</big>"
+
+#~ msgid "<big>Contents</big>"
+#~ msgstr "<big>ÐÑÐÑÑÐÐÐÐÐ</big>"
+
+#~ msgid "<big>Edit Partition</big>"
+#~ msgstr "<big>ÐÐÐÐÐÑÐÑÐÐÐ ÐÐ ÐÑÐÐ</big>"
+
+#~ msgid "<big>Format Disk</big>"
+#~ msgstr "<big>ÐÐÑÐÐÑÐÑÐÐÐ ÐÐ ÐÐÑÐÐ</big>"