[gnome-disk-utility] uk update



commit f2b0533ff2312ff4b61c8a72b15779e1dca0d593
Author: Daniel Korostil <ted korostiled gmail com>
Date:   Fri Sep 7 21:25:45 2012 +0300

    uk update

 po/uk.po | 2813 ++++++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 1736 insertions(+), 1077 deletions(-)
---
diff --git a/po/uk.po b/po/uk.po
index 6280883..eaaf224 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-disk-utility\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-06 22:14+0200\n"
-"PO-Revision-Date: 2012-03-06 22:30+0300\n"
-"Last-Translator: Korostil Daniel <ted korostiled gmail com>\n"
+"POT-Creation-Date: 2012-09-04 21:55+0300\n"
+"PO-Revision-Date: 2012-09-05 18:40-0700\n"
+"Last-Translator: Daniel <ted korostiled gmail com>\n"
 "Language-Team: translation linux org ua\n"
 "Language: uk\n"
 "MIME-Version: 1.0\n"
@@ -18,19 +18,40 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.7.1\n"
+"X-Generator: Virtaal 0.7.0\n"
 "X-Project-Style: gnome\n"
 
-#: ../data/palimpsest.desktop.in.h:1 ../data/ui/about-dialog.ui.h:1
-#: ../src/palimpsest/gduwindow.c:888
+#: ../data/gnome-disk-image-mounter.desktop.in.h:1
+#: ../src/disk-image-mounter/main.c:46
+msgid "Disk Image Mounter"
+msgstr "ÐÐÐÑÑÐÐÐÐÑ ÐÐÑÐÐÑÐ ÐÐÑÐÐ"
+
+#: ../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/ui/about-dialog.ui.h:2
+#: ../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"
 "Copyright  2008-2012 David Zeuthen"
@@ -38,141 +59,466 @@ msgstr ""
 "Â 2008-2012 Red Hat, Inc.\n"
 "Â 2008-2012 David Zeuthen"
 
-#: ../data/ui/about-dialog.ui.h:4
+#: ../data/ui/about-dialog.ui.h:4
 msgid "View, modify and configure disks and media"
 msgstr "ÐÐÑÐÐÐÑÐ, ÐÐÑÐÑÐÐÐÐÑ Ð ÐÐÐÐÑÑÑÐÐÐÐÑ ÐÐÑÐÑÐ Ñ ÐÐÑÑÑÐ"
 
-#: ../data/ui/about-dialog.ui.h:5
+#: ../data/ui/about-dialog.ui.h:5
 msgid "translator-credits"
 msgstr ""
 "wanderlust <wanderlust ukr net>\n"
 "ÐÐÐÑÐÐ ÐÐÑÐÐÐÐÐÐÐ\n"
 "Daniel Korostil <ted korostiled gmail com>"
 
-#: ../data/ui/app-menu.ui.h:1
+#: ../data/ui/app-menu.ui.h:1
 msgid "Attach Disk _Image..."
 msgstr "ÐÑÐ'ÑÐÐÐÑÐ _ÐÐÑÐÐ ÐÐÑÐÐâ"
 
-#: ../data/ui/app-menu.ui.h:2
+#: ../data/ui/app-menu.ui.h:2
 msgid "_About Disks"
 msgstr "_ÐÑÐ ÐÑÐÐÑÐÐÑ"
 
-#: ../data/ui/app-menu.ui.h:3
+#: ../data/ui/app-menu.ui.h:3
 msgid "_Quit"
 msgstr "ÐÐ_ÐÑÐ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:1
-#: ../data/ui/edit-dos-partition-dialog.ui.h:1
-#: ../data/ui/edit-filesystem-dialog.ui.h:2
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
-#: ../data/ui/edit-partition-dialog.ui.h:1
+#: ../data/ui/benchmark-dialog.ui.h:1
+msgid "_Start Benchmark..."
+msgstr "_ÐÐÐÑÑÑÐÑÐ ÑÐÑÑÑÐÐÐÐÑâ"
+
+#: ../data/ui/benchmark-dialog.ui.h:2
+msgid "_Abort Benchmark"
+msgstr "_ÐÐÐÑÑÐÐÑÐ ÑÐÑÑÑÐÐÐÐÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:3
+msgid "Last Benchmarked"
+msgstr "ÐÐÑÑÐÐÐÑ ÑÐÑÑÐÐÐÐÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:4
+msgid "Average Read Rate"
+msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÐÐÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:5
+msgid "Average Write Rate"
+msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:6
+msgid "Average Access Time"
+msgstr "ÐÐÑÐÐÐÑÐ ÑÐÑ ÐÐÑÑÑÐÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:7
+msgid "Disk Drive or Device"
+msgstr "ÐÑÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÐ ÐÑÐÑÑÑÑÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:8
+msgid "Sample Size"
+msgstr "ÐÐÐÐÑÑ ÐÐÐÑÑÐÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:9
+msgid "_Start Benchmarking..."
+msgstr "_ÐÐÐÑÑÑÐÑÐ ÑÐÑÑÑÐÐÐÐÑâ"
+
+#: ../data/ui/benchmark-dialog.ui.h:10
+msgid ""
+"Benchmarking involves measuring the transfer rate on various area of the "
+"device as well as measuring how long it takes to seek from one random area "
+"to another. Please back up important data before using the write benchmark."
+msgstr ""
+"ÐÐÑÑÑÐÐÐÐÑ ÑÐÑÐÑÐÐÑÑ ÐÐÐÑÑÑÐÐÐÐÑ ÑÐÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÐÐÑ ÐÐ ÑÑÐÐÑ ÐÑÐÑÐÐÐ "
+"ÐÑÐÑÑÑÐÑ ÑÐÐ ÑÐÐÐ, ÑÐ ÐÐÐÑÑÑÐÐÐÐÑ ÑÑÐÐÐÐÐÑÑÑ ÐÐÑÑÐÑ Ð ÐÐÐÑÑÑ ÐÐÐÐÐÐÐÐÐÑ "
+"ÐÑÐÑÐÐÐ ÐÐ ÑÐÑÐÑ. ÐÑÐÐÑÑÑ ÐÐÐÑÑ ÐÐÐÐÐÐÐÑ ÐÐÐÐÑ ÐÐÑÐÐ ÐÐÐÐÑÐÑÑÐÐÐÑ ÑÐÑÑÑÐÐÐÐÑ "
+"ÐÐÐÐÑÑ."
+
+#: ../data/ui/benchmark-dialog.ui.h:11
+msgid "Transfer Rate"
+msgstr "ÐÐÐÐÐÑÑÑÑ ÐÐÑÐÐÐÑÐÐÐÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:12
+msgid "Number of S_amples"
+msgstr "ÐÑÐÑÐÑÑÑÑ Ð_ÐÐÑÑÐÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:13
+msgid "Sample S_ize (MiB)"
+msgstr "_ÐÐÐÐÑÑ ÐÐÐÑÑÐÐ (ÐÑÐ)"
+
+#: ../data/ui/benchmark-dialog.ui.h:14
+msgid "Also perform _write-benchmark"
+msgstr "ÐÐÐÐÐ ÐÐÐÐÐÐÑÐ ÑÐÑÑÑÐÐÐÐÑ _ÐÐÐÐÑÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:15
+msgid ""
+"Bechmarking the write-rate of a disk requires exclusive access to the disk "
+"(e.g. the disk or its partitions cannot be mounted or in use) and involves "
+"reading data and then writing it back. As a result, the contents of the disk "
+"is not changed.\n"
+"\n"
+"If not checked, the write-part of the benchmark will not be done but on the "
+"other hand exclusive access to the device is not needed (e.g. the disk or "
+"device can be in use) ."
+msgstr ""
+"ÐÐÑÑÑÐÐÐÐÑ ÑÐÐÐÐÐÑÑÑ ÐÐÐÐÑÑ ÐÐÑÐÐ ÐÐÑÑÐÐÑÑ ÐÑÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐÑ ÐÐ ÐÐÑÐÑ "
+"(ÐÐÐÑÐÐÐÐÐ, ÐÐÑÐ ÐÐÐ ÐÐÐÐ ÑÐÐÐÑÐÐ ÐÐ ÐÐÐÐÐ ÐÐÐÑÑÐÐÑÐ ÐÐÐ ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ), "
+"ÑÐÑÐÑÐÐÑÑ ÑÐÑÐÐÐÑ ÐÐÐÐÑ Ñ ÐÐÐÐÑÑÐÐÐÐÑ ÑÑ ÐÐÐÐÐ. ÐÐ ÐÐÑÐÑÐÐÐ, ÐÐÑÑÑ ÐÐÑÐÐ ÐÐ "
+"ÐÐÑÐÑÑÑÑÑÑ.\n"
+"\n"
+"ÐÐÑÐ ÐÐ ÐÐÐÐÐÑÐÐÐ, ÑÐÑÑÐÐÐ ÑÐÑÑÑÐÐÐÐÑ ÑÐÐÐ ÐÐÐÐÑÑÐÐÐÐÑ ÐÐ ÐÑÐÐ ÐÐÐÐÑÑÐÐÐ, "
+"ÐÑÐÑÐ Ð ÑÐÑÐÐÐ ÐÐÐÑ ÐÑÐÐÐÐÐÐÐ ÐÐÑÑÑÐ ÐÐ ÐÑÐÑÑÑÐÑ ÐÐ ÐÐÑÑÑÐÐÐ (ÐÐÐÑÐÐÐÐÐ, "
+"ÐÐÑÐ ÐÐÐ ÐÑÐÑÑÑÑÐ ÐÐ ÐÐÐÐÐ ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ)."
+
+#: ../data/ui/benchmark-dialog.ui.h:18
+msgid ""
+"Number of samples. Bigger number produces a more accurate picture of access "
+"time patterns but takes more time."
+msgstr ""
+"ÐÑÐÑÐÑÑÑÑ ÐÐÐÑÑÐÐ. ÐÑÐÑÑÐ ÐÑÐÑÐÑÑÑÑ ÐÑÐÐÐÐÑÑ ÑÐÑÐÑÑÑ ÐÐÑÑÐÐÑ ÑÐÐÐÐÐÑÐ ÑÐÑÑ "
+"ÐÐÑÑÑÐÑ, ÐÑÐÑÐ ÐÐÐÐÐÑ ÐÑÐÑÑÐ ÑÐÑÑ. "
+
+#: ../data/ui/benchmark-dialog.ui.h:19
+msgid ""
+"The number of MiB (1048576 bytes) to read/write for each sample. Big sample "
+"sizes tend to produce more accurate benchmarks at the cost of the benchmark "
+"taking more time."
+msgstr ""
+"ÐÑÐÑÐÑÑÑÑ ÐÑÐ (1048576 ÐÐÐÑÑÐ) ÐÐÑ ÑÐÑÐÐÐÑ Ñ ÐÐÐÐÑÑÐÐÐÐÑ ÐÐÐÐÐÑ ÐÐÐÑÑÐÐ. "
+"ÐÐÐÐÐÐÐ ÑÐÐÐÑÑ ÐÐÐÑÑÐÐ ÑÐÑÐÑÑ ÑÐÑÐÑÑÐÐÑ ÑÐÑÑÑÐÐÐÐÑ ÐÐ ÑÐÑÑÐÐÐ ÑÐÐÐ, ÑÐ ÑÐ "
+"ÐÐÐÐÐÑ ÐÑÐÑÑÐ ÑÐÑÑ."
+
+#: ../data/ui/benchmark-dialog.ui.h:20
+msgid "Access Time"
+msgstr "ÐÐÑ ÐÐÑÑÑÐÑ"
+
+#: ../data/ui/benchmark-dialog.ui.h:21
+msgid "Number of Sampl_es"
+msgstr "ÐÑÐÑÐÑÑÑÑ ÐÐÐÑÑÐÐ"
+
+#: ../data/ui/benchmark-dialog.ui.h:22
+msgid ""
+"Number of samples. Bigger number produces more smooth graphs but the "
+"benchmark will take more time."
+msgstr ""
+"ÐÑÐÑÐÑÑÑÑ ÐÐÐÑÑÐÐ. ÐÑÐÑÑÐ ÐÑÐÑÐÑÑÑÑ ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÑÑÐÐ ÐÑÐÑÑÐ, ÐÐÐÐÐ "
+"ÑÐÑÑÑÐÐÐÐÑ ÐÐÐÐÑÐ ÐÑÐÑÑÐ ÑÐÑÑ."
+
+#: ../data/ui/change-passphrase-dialog.ui.h:1
+#: ../data/ui/edit-dos-partition-dialog.ui.h:1
+#: ../data/ui/edit-filesystem-dialog.ui.h:2
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
+#: ../data/ui/edit-partition-dialog.ui.h:1
 msgid "C_hange"
 msgstr "_ÐÐÑÐÐÑÐ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:2
-msgid "<big>Change Passphrase</big>"
-msgstr "<big>ÐÐÑÐÐÑÐ ÐÐÑÐÐÑ</big>"
+#: ../data/ui/change-passphrase-dialog.ui.h:2
+msgid "Change Passphrase"
+msgstr "ÐÐÑÐÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:3
+#: ../data/ui/change-passphrase-dialog.ui.h:3
 msgid "Curr_ent Passphrase"
 msgstr "Ð_ÐÑÐÑÐÐÐ ÐÐÑÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:4
+#: ../data/ui/change-passphrase-dialog.ui.h:4
 msgid "Enter current passphrase used to protect the data"
 msgstr "ÐÐÐÑÑÐ ÐÐÑÐÑÐÐÐ ÐÐÑÐÐÑ ÐÐÑ ÐÐÑÐÑÑÑ ÐÐÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:5
-#: ../data/ui/filesystem-create.ui.h:12
+#: ../data/ui/change-passphrase-dialog.ui.h:5
+#: ../data/ui/filesystem-create.ui.h:12
 msgid "Sho_w Passphrases"
 msgstr "_ÐÐÐÐÐÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:6
-#: ../data/ui/filesystem-create.ui.h:13
+#: ../data/ui/change-passphrase-dialog.ui.h:6
+#: ../data/ui/filesystem-create.ui.h:13
 msgid "Check this box to see the passphrases entered above"
 msgstr "ÐÐÑÐÐÑÑÐÑÐ ÑÐ ÐÐÐÐ, ÑÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐÐÐÐÑ ÐÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:7
-#: ../data/ui/filesystem-create.ui.h:11
+#: ../data/ui/change-passphrase-dialog.ui.h:7
+#: ../data/ui/filesystem-create.ui.h:11
 msgid "Confirm passphrase entered above"
 msgstr "ÐÑÐÑÐÐÑÐÐÑÐ ÐÐÐÐÐÐÐÐ ÐÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:8
+#: ../data/ui/change-passphrase-dialog.ui.h:8
 msgid "Enter new passphrase used to protect the data"
 msgstr "ÐÐÐÑÑÐ ÐÐÐÐÐ ÐÐÑÐÐÑ ÐÐÑ ÐÐÑÐÑÑÑ ÐÐÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:9
-#: ../data/ui/filesystem-create.ui.h:9
+#: ../data/ui/change-passphrase-dialog.ui.h:9
+#: ../data/ui/filesystem-create.ui.h:9
 msgid "C_onfirm Passphrase"
 msgstr "ÐÑÐ_ÑÐÐÑÐÐÑÐ ÐÐÑÐÐÑ"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:10
+#: ../data/ui/change-passphrase-dialog.ui.h:10
 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-gpt-partition-dialog.ui.h:5
-#: ../data/ui/filesystem-create.ui.h:2
+#: ../data/ui/create-disk-image-dialog.ui.h:1
+#: ../data/ui/edit-crypttab-dialog.ui.h:3
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:5
+#: ../data/ui/filesystem-create.ui.h:2
 msgid "_Name"
 msgstr "_ÐÐÐÐÐ"
 
-#: ../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-partition-dialog.ui.h:1
+#: ../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>"
-msgstr "<big>ÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐ</big>"
+#: ../data/ui/create-partition-dialog.ui.h:2
+msgid "Create Partition"
+msgstr "ÐÑÐÐÑÐÑÐ ÑÐÐÐÑÐ"
 
-#: ../data/ui/create-partition-dialog.ui.h:3
+#: ../data/ui/create-partition-dialog.ui.h:3
 msgid "Partition _Size"
 msgstr "_ÐÐÐÐÑÑ ÑÐÐÐÑÐÑ"
 
-#: ../data/ui/create-partition-dialog.ui.h:4
+#: ../data/ui/create-partition-dialog.ui.h:4
 msgid "The size of the partition to create, in megabytes"
 msgstr "ÐÐÐÐÑÑ ÑÐÐÐÑÐÑ ÐÐÑ ÑÑÐÐÑÐÐÐÑ, Ð ÐÐÐÐÐÐÐÑÐÑ"
 
-#: ../data/ui/create-partition-dialog.ui.h:5
+#: ../data/ui/create-partition-dialog.ui.h:5
 msgid "MB"
 msgstr "ÐÐ"
 
-#: ../data/ui/create-partition-dialog.ui.h:6
+#: ../data/ui/create-partition-dialog.ui.h:6
 msgid "Free Space _Following"
 msgstr "ÐÑÐÑÐÐÐÐ ÐÑÑÑÑ _ÐÑÑÐÑ"
 
-#: ../data/ui/create-partition-dialog.ui.h:7
+#: ../data/ui/create-partition-dialog.ui.h:7
 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 "_Standby Timeout"
+msgstr "ÐÑÐÐÑÐ ÑÐÐÐÐÑ _ÑÐÑÐÑÐÐÐÐÑ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:2
+msgid "Enter Standby After"
+msgstr "ÐÐÐÑÑÐ ÑÐÐÐÐ ÑÐÑÐÑÐÐÐÐÑ ÐÐ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:3
+msgid "_Advanced Power Management"
+msgstr "_ÐÐÐÑÐÑÐÐÐ ÐÐÑÑÐÐÐÐÑ ÐÐÐÐÐÐÐÑÐ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:4
+msgid "APM Level"
+msgstr "ÐÑÐÐÐÑ APM"
+
+#: ../data/ui/disk-settings-dialog.ui.h:5
+msgid ""
+"Agressive spin-down may wear out the drive faster than anticipated. Please "
+"check the âStart/Stop Countâ SMART attribute from time to time"
+msgstr ""
+"ÐÐÑÐÑÐÐÐÐ ÑÐÑÑÑÑÐÐÐÐÑ ÐÐÐÐ ÐÐÐÑÑÐÐÑÐ ÐÐÑÑÐ ÑÐÐÐÑÐ ÐÐ ÐÑÑÐÑÐÐÐÐÑ. ÐÐÑÐÐÑÑÑÐÑÐ "
+"ÐÑÑÐÐÑÑ ÂÐÑÐÑÐÑÑÑÑ ÑÑÐÑÑÑÐ/ÐÑÐÐÐÐÐÂ ÑÐÑ ÐÑÐ ÑÐÑÑ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:6
+msgid "Automatic Aco_ustic Management"
+msgstr "ÐÐÑÐÐÐÑÐÑÐÐ ÐÐÑÑÐÐÐÐÑ _ÐÐÐÑÐÐÐÐÐÐ ÐÐÐÐÑÐÐÐ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:7
+msgid "Vendor Recommended"
+msgstr "ÐÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐÐÐ"
+
+#: ../data/ui/disk-settings-dialog.ui.h:8
+msgid "AAM Level"
+msgstr "ÐÑÐÐÐÑ AAM"
+
+#: ../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 "ÐÐÑÑÐÐÐ ÐÐÐÐÐ"
+
+#. 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
+msgid "_Volumes"
+msgstr "_ÐÐÐÐ"
+
+#: ../data/ui/disks.ui.h:27
+msgid "Device"
+msgstr "ÐÑÐÑÑÑÑÐ"
+
+#: ../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 "ÐÐÐÑ SMART Ñ ÑÐÑÑÐâ"
+
+#: ../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/edit-crypttab-dialog.ui.h:1
+#: ../data/ui/disks.ui.h:47
+msgid "Benchmark Volume..."
+msgstr "ÐÐÐ ÑÐÑÑÑÐÐÐÐÑâ"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:1
 msgid "_Automatic Encryption Options"
 msgstr "ÐÐÑÐÐÐÑÑÐ _ÐÐÑÐÐÐÑÐÑÐÐÐÐ ÑÐÑÑÑÐÐÐÐÑ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:2
+#: ../data/ui/edit-crypttab-dialog.ui.h:2
 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,56 +528,56 @@ msgstr ""
 "ÐÐÑÐÐÐÑÑÐ ÑÐÑÑÑÐÐÐÐÑ Ñ ÐÐÑÐÐÑ ÐÐÑ ÐÑÐÑÑÑÐÑ. ÐÐÑÐÐÐÑÑÐ ÐÑÐÐÐÐÑÐÐÑÑÑ ÐÐÐÐÑÑ Ð "
 "ÑÐÐÐÑ <b>/etc/crypttab</b>"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:4
+#: ../data/ui/edit-crypttab-dialog.ui.h:4
 msgid "Opt_ions"
 msgstr "_ÐÐÑÐÐÐÑÑÐ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:5
+#: ../data/ui/edit-crypttab-dialog.ui.h:5
 msgid ""
 "The name to use for the unlocked device - the device is set up as the name "
 "prefixed with <b>/dev/mapper</b>/"
 msgstr ""
-"ÐÐÐÐÐ ÐÐÑ ÑÐÐÐÐÐÐÐÐÐÐÐÑ ÐÑÐÑÑÑÐÑÐ â ÐÑÐÑÑÑÑÐ ÐÐÐÑÑÐÐÑÑÑÑÑ ÑÐ ÐÑÐÑÑÐÑ ÐÐ "
-"<b>/dev/mapper</b>/"
+"ÐÐÐÐÐ ÐÐÑ ÑÐÐÐÐÐÐÐÐÐÐÐÑ ÐÑÐÑÑÑÐÑÐ â ÐÑÐÑÑÑÑÐ ÐÐÐÑÑÐÐÑÑÑÑÑ ÑÐ ÐÑÐÑÑÐÑ ÐÐ <b>/"
+"dev/mapper</b>/"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:6
+#: ../data/ui/edit-crypttab-dialog.ui.h:6
 msgid "Options to use when unlocking the device"
 msgstr "ÐÐÑÐÐÐÑÑÐ ÑÐÐÐÐÐÐÑÐÐÐÐÑ ÐÑÐÑÑÑÐÑ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:7
+#: ../data/ui/edit-crypttab-dialog.ui.h:7
 msgid "Passphrase File"
 msgstr "ÐÐÐÐ ÐÐÑÐÐÑ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:8
-#: ../data/ui/unlock-device-dialog.ui.h:3
+#: ../data/ui/edit-crypttab-dialog.ui.h:8
+#: ../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:9
 msgid ""
 "Passphrase of the device or empty to request from user when setting up the "
 "device"
 msgstr ""
 "ÐÐÑÐÐÑ ÐÑÐÑÑÑÐÑ ÐÐÐ ÐÐÑÐÐÐÑÐ Ð ÐÑÐÑÐÐÐÑ ÐÑÐ ÐÐÑÐÑÑÑÐÐÑÐ ÐÑÐ ÑÐÑÑ ÐÐÐÑÑÐÑ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:10 ../data/ui/filesystem-create.ui.h:8
-#: ../data/ui/unlock-device-dialog.ui.h:2
+#: ../data/ui/edit-crypttab-dialog.ui.h:10 ../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:11
 msgid "_Unlock at startup"
 msgstr "_ÐÐÐÐÐÐÐÐÐÑÐÐÑÐ ÐÑÐ ÑÐÑ ÐÐÐÑÑÐÑ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:12
+#: ../data/ui/edit-crypttab-dialog.ui.h:12
 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:13
 msgid "Require additional authori_zation to unlock"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÐ_ÐÐÑÑÑ ÐÐÑ ÑÐÐÐÐÐÐÑÐÐÐÐÑ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:14
+#: ../data/ui/edit-crypttab-dialog.ui.h:14
 msgid ""
 "If checked, additional authorization is required to unlock the device [x-"
 "udisks-auth]"
@@ -239,27 +585,27 @@ 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:2
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:2
+#: ../data/ui/edit-partition-dialog.ui.h:2
+msgid "Edit Partition"
+msgstr "ÐÐÐÐÐÑÐÐÑÐ ÑÐÐÐÑÐ"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:3
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:3
-#: ../data/ui/edit-partition-dialog.ui.h:3 ../data/ui/filesystem-create.ui.h:1
+#: ../data/ui/edit-dos-partition-dialog.ui.h:3
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:3
+#: ../data/ui/edit-partition-dialog.ui.h:3 ../data/ui/filesystem-create.ui.h:1
 msgid "_Type"
 msgstr "_ÐÐÐ"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:4
+#: ../data/ui/edit-dos-partition-dialog.ui.h:4
 msgid "The partition type as a 8-bit unsigned integer"
 msgstr "ÐÐÐ ÑÐÐÐÑÐÑ â 8-Ð ÐÑÑÐÐÐ ÐÐÐÑÐÐÐÑÐÐÐ ÑÐÑÐÐ"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:5
+#: ../data/ui/edit-dos-partition-dialog.ui.h:5
 msgid "_Bootable"
 msgstr "_ÐÐÐÐÐÑÐÐÑÐÐÐÑÐÐÐ"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:6
+#: ../data/ui/edit-dos-partition-dialog.ui.h:6
 msgid ""
 "A flag used by the Platform bootloader to determine where the OS should be "
 "loaded from. Sometimes the partition with this flag set is referred to as "
@@ -269,19 +615,19 @@ msgstr ""
 "ÑÐÑÑÐÐÑ ÐÐÐÐÐÑÐÐÑÐÐÑÐÑÑ. ÐÐÐÐÐÐ ÑÐÐÐÑÐ Ð ÑÐÐ ÐÑÐÐÐÑÑÐÐ ÐÐÑÐÐÐÑÑÑÑÑ ÐÐ "
 "<i>ÐÐÑÐÐÐÐÐ</i> ÑÐÐÐÑÐ"
 
-#: ../data/ui/edit-filesystem-dialog.ui.h:1
-msgid "<big>Change Filesystem Label</big>"
-msgstr "<big>ÐÐÑÐÐÑÐ ÐÑÑÐÑ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ</big>"
+#: ../data/ui/edit-filesystem-dialog.ui.h:1
+msgid "Change Filesystem Label"
+msgstr "ÐÐÑÐÐÑÐ ÐÑÑÐÑ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ"
 
-#: ../data/ui/edit-filesystem-dialog.ui.h:3
+#: ../data/ui/edit-filesystem-dialog.ui.h:3
 msgid "_Label"
 msgstr "_ÐÑÑÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:1
+#: ../data/ui/edit-fstab-dialog.ui.h:1
 msgid "_Automatic Mount Options"
 msgstr "ÐÐÑÐÐÐÑÑÐ _ÐÐÑÐÐÐÑÐÑÐÐÐÐ ÐÐÐÑÑÐÐÐÐÑ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:2
+#: ../data/ui/edit-fstab-dialog.ui.h:2
 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/"
@@ -291,11 +637,11 @@ msgstr ""
 "ÐÐÑÐÐÐÑÑÐ ÐÐÐÑÑÐÐÐÐÑ Ñ ÐÐÑÐÐÑ ÐÐÑ ÐÑÐÑÑÑÐÑ. ÐÐÑÐÐÐÑÑÐ ÐÑÐÐÐÐÑÐÐÑÑÑ ÐÐÐÐÑÑ Ð "
 "ÑÐÐÐÑ <b>/etc/fstab</b>"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:3
+#: ../data/ui/edit-fstab-dialog.ui.h:3
 msgid "I_dentify As"
 msgstr "_ÐÐÐÐÑÐÑÑÐÑÐÐÑÐ ÑÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:4
+#: ../data/ui/edit-fstab-dialog.ui.h:4
 msgid ""
 "The <b>special device file</b> - use symlinks in the <b>/dev/disk</b> "
 "hierarchy to control the scope of the entry"
@@ -303,7 +649,7 @@ msgstr ""
 "<b>ÐÑÐÐÐÐÐÐÐ ÑÐÐÐ ÐÑÐÑÑÑÐÑ</b> â ÐÐÐÐÑÐÑÑÐÐÑÑ ÑÐÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐÑ ÐÐ "
 "ÑÑÑÐÑÑÑÑ  <b>/dev/disk</b>, ÑÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐÐÑÑÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:5
+#: ../data/ui/edit-fstab-dialog.ui.h:5
 msgid ""
 "The special device file - use symlinks in the /dev/disk hierarchy to control "
 "the scope of the entry"
@@ -311,48 +657,48 @@ msgstr ""
 "ÐÑÐÐÐÐÐÐÐ ÑÐÐÐ ÐÑÐÑÑÑÐÑ â ÐÐÐÐÑÐÑÑÐÐÑÑ ÑÐÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐÑ ÐÐ ÑÑÑÐÑÑÑÑ /dev/"
 "disk, ÑÐÐ ÐÐÐÑÑÐÐÑÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐÐÑÑÐ "
 
-#: ../data/ui/edit-fstab-dialog.ui.h:6
+#: ../data/ui/edit-fstab-dialog.ui.h:6
 msgid "Mount _Point"
 msgstr "ÐÐÑÐÐ _ÐÐÐÑÑÐÐÐÐÑ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:7
+#: ../data/ui/edit-fstab-dialog.ui.h:7
 msgid "Filesystem _Type"
 msgstr "_ÐÐÐ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:8
+#: ../data/ui/edit-fstab-dialog.ui.h:8
 msgid "The directory to mount the device in"
 msgstr "ÐÐÑÐÐÐÐ ÐÐÑ ÐÐÐÑÑÐÐÐÐÑ ÐÑÐÑÑÑÐÑ Ð ÐÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:9
+#: ../data/ui/edit-fstab-dialog.ui.h:9
 msgid "The filesystem type to use"
 msgstr "ÐÐÐÑÐÐÐÐ ÑÐÐ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:10
+#: ../data/ui/edit-fstab-dialog.ui.h:10
 msgid "Display _Name"
 msgstr "ÐÐÑÐÐÐÐ _ÐÐÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:11
+#: ../data/ui/edit-fstab-dialog.ui.h:11
 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:12
 msgid "Icon Na_me"
 msgstr "ÐÐÐÐÐ ÐÑÐ_ÑÐÐÑÐÐÐ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:13
+#: ../data/ui/edit-fstab-dialog.ui.h:13
 msgid ""
 "If set, the name of the icon to use in the device in the user interface [x-"
 "gvfs-icon=]"
 msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÐÐ, ÐÐÐÐÐ ÐÑÐÑÐÐÑÐÐÐ ÐÑÐÐ ÐÐÐÐÑÐÑÑÐÐÐ ÐÐÑ ÑÐÑÐÑÑÐÐÑÑ [x-gvfs-icon=]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:14
+#: ../data/ui/edit-fstab-dialog.ui.h:14
 msgid "Sho_w in user interface"
 msgstr "_ÐÐÐÐÐÑÐÐÑÐ Ð ÑÐÑÐÑÑÐÐÑÑ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:15
+#: ../data/ui/edit-fstab-dialog.ui.h:15
 msgid ""
 "If checked, the device is always shown in the user interface no matter what "
 "its directory is [x-gvfs-show]"
@@ -360,11 +706,11 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ, ÐÑÐÑÑÑÑÐ ÐÑÐÐ ÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÑÐÑÑ Ð ÑÐÑÐÑÑÐÐÑÑ, ÐÐÐÑÐ ÐÐÐÐ "
 "ÐÐÑÐÐÐÐ [x-gvfs-show]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:16
+#: ../data/ui/edit-fstab-dialog.ui.h:16
 msgid "Require additional authori_zation to mount"
 msgstr "ÐÐÑÑÑÐÐÐ ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐ_ÐÐÑÑÑ ÐÐÑ ÐÐÐÑÑÐÐÐÐÑ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:17
+#: ../data/ui/edit-fstab-dialog.ui.h:17
 msgid ""
 "If checked, additional authorization is required to mount the device [x-"
 "udisks-auth]"
@@ -372,27 +718,27 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÑÐÐÐ, ÐÐÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐÑÑÑ ÐÐÑÑÑÐÐÐ ÐÐÑ ÐÐÐÑÑÐÐÐÐÑ ÐÑÐÑÑÑÐÑ [x-"
 "udisks-auth]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:18
+#: ../data/ui/edit-fstab-dialog.ui.h:18
 msgid "Mount at _startup"
 msgstr "ÐÐÐÑÑÐÐÑÐ ÐÑÐ ÑÐÑ ÐÐÐ_ÑÑÐÑ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:19
+#: ../data/ui/edit-fstab-dialog.ui.h:19
 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:20
 msgid "Mount Opt_ions"
 msgstr "_ÐÐÑÐÐÐÑÑÐ ÐÐÐÑÑÐÐÐÐÑ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:21
+#: ../data/ui/edit-fstab-dialog.ui.h:21
 msgid "The mount options stored in the <b>/etc/fstab</b> file"
 msgstr "ÐÐÑÐÐÐÑÑÐ ÐÐÐÑÑÐÐÐÐÑ ÐÐÐÑÑÐÐÑÑÑÑÑ Ñ ÑÐÐÐÑ <b>/etc/fstab</b>"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:4
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:4
 msgid "The partition type represented as a 32-bit <i>GUID</i>"
 msgstr "ÐÐÐ ÑÐÐÐÑÐÑ ÐÐÐÑÐÐÐÐÐ ÑÐ 32-ÐÑ ÐÑÑÐÐÐ <i>GUID</i>"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:6
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:6
 msgid ""
 "The partition name (up to 36 unicode characters). This is useful if you want "
 "to refer to the device via a symlink in the <b>/dev/disk/by-partlabel</b> "
@@ -401,11 +747,11 @@ msgstr ""
 "ÐÐÐÐÐ ÑÐÐÐÑÐÑ (ÐÐÐÐÐ 36 ÑÐÐÐÐÐÑÐ). ÐÐ ÐÑÑÑÐÐ, ÐÐÐÐ ÐÐÐÐÑÑÐ ÐÐÑÐÐÐÑÐÑÑ ÐÐ "
 "ÐÑÐÑÑÑÑÐ ÑÐÑÐÐ ÑÐÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐÑ Ñ ÐÐÑÐÐÐÐÑ  <b>/dev/disk/by-partlabel</b>"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:7
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:7
 msgid "_System partition"
 msgstr "_ÐÐÑÑÐÐÐÐÐ ÑÐÐÐÑÐ"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:8
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:8
 msgid ""
 "Used to indicate that the partition and its contents are required for the OS/"
 "Platform to function. Special care should be taken to not delete or "
@@ -415,11 +761,11 @@ msgstr ""
 "ÐÐÐÑÐÑÑÐÐÐÑ ÑÐÑÑÐÐÐ. ÐÑÐÐÐÐÐÐ ÑÐÑÐ ÐÐÐÐÑÐÑÑÐ, ÑÐÐ ÐÐ ÐÐÐÑÑÐÐÐ ÐÐÐ "
 "ÐÐÑÐÐÐÐÐÑÐÐÐ ÐÐÑÑÑ"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:9
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:9
 msgid "Legacy BIOS _Bootable"
 msgstr "_ÐÐÐÐÐÑÐÐÑÐÐÐÑÐÐÐ BIOS"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:10
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:10
 msgid ""
 "Legacy BIOS Bootable. This is equivalent to Master Boot Record <i>bootable</"
 "i> flag. It is normally only used for GPT partitions on MBR systems"
@@ -427,11 +773,11 @@ msgstr ""
 "ÐÐÐÐÐÑÐÐÑÐÐÐÑÐÐÐ BIOS. ÐÑÐ ÑÑÐÐÐÐ ÐÑÐÐÐÑÑÑ <i>ÐÐÐÐÐÑÐÐÑÐÐÐÑÐÐÐ</i> Ð ÐÐÐÑÑÑÑ "
 "ÐÐÐÐÑÑ ÐÐÐÐÐÑÐÐÐÐÐÑ. ÐÐÐÐÐÑÐÐ ÑÐ ÐÐÑÐ ÐÐÑ ÑÐÐÐÑÐÑÐ GPT ÐÐ ÑÐÑÑÐÐÐÑ MBR"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:11
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:11
 msgid "_Read-Only"
 msgstr "_ÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐÑ"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:12
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:12
 msgid ""
 "If set, some OSes may mount or use the contents of the partition as read-"
 "only instead of read-write"
@@ -439,11 +785,11 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÐÐ, ÐÐÑÐÑ ÐÐÐÑÐÑÑÐÐÑ ÑÐÑÑÐÐÐ ÐÐÐÑÑÑ ÐÐÐÐÐÑÐÐÑÐÐÑÐ ÐÐÐ "
 "ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ ÐÐÑÑÑ ÑÐÐÐÑÐÑÐ ÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐÑ ÐÐÐÑÑÑÑ ÑÐÑÐÐÐÑ Ñ ÐÐÐÐÑÑ"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:13
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:13
 msgid "H_idden"
 msgstr "_ÐÑÐÐÐÐÐÐ"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:14
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:14
 msgid ""
 "If set, some OSes may hide the contents of the partition in their user "
 "interfaces"
@@ -451,17 +797,17 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÐÐ, ÐÐÑÐÑ ÐÐÐÑÐÑÑÐÐÑ ÑÐÑÑÐÐÐ ÐÐÐÑÑÑ ÑÐÐÐÑÐ ÐÐÑÑÑ ÑÐÐÐÑÐÑÐ Ñ ÑÑÐÑÑ "
 "ÑÐÑÐÑÑÐÐÑÐÑ"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:15
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:15
 msgid "Do Not _Automount"
 msgstr "ÐÐ ÐÐÐÑÑÐÐÑÐ _ÐÐÑÐÐÐÑÐÑÐÐ"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:16
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:16
 msgid "If set, some OSes may not automount the contents of the partition"
 msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÐÐ, ÐÐÑÐÑ ÐÐÐÑÐÑÑÐÐÑ ÑÐÑÑÐÐÐ ÐÐÐÐÑÑÑ ÑÐÐÐÑÑÑÐÐÐ ÐÐÐÑÑÐÐÑÐ ÐÐÑÑÑ "
 "ÑÐÐÐÑÐÑ"
 
-#: ../data/ui/filesystem-create.ui.h:3
+#: ../data/ui/filesystem-create.ui.h:3
 msgid ""
 "The name to use for the filesystem. This is useful if you want to refer to "
 "the device via a symlink in the <b>/dev/disk/by-label</b> directory"
@@ -469,7 +815,7 @@ msgstr ""
 "ÐÐÐÐÐ ÐÐÑ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ. ÐÐ ÐÑÑÑÐÐ, ÐÐÐÐ ÐÐÐÐÑÑÐ ÐÐÑÐÐÐÑÐÑÑ ÐÐ ÐÑÐÑÑÑÑÐ "
 "ÑÐÑÐÐ ÑÐÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐÑ ÐÐÑÐÐÐÐÑ <b>/dev/disk/by-label</b>"
 
-#: ../data/ui/filesystem-create.ui.h:4
+#: ../data/ui/filesystem-create.ui.h:4
 msgid ""
 "The name to use for the filesystem. This is useful if you want to refer to "
 "the device via a symlink in the /dev/disk/by-label directory"
@@ -477,11 +823,11 @@ msgstr ""
 "ÐÐÐÐÐ ÐÐÑ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ. ÐÐ ÐÑÑÑÐÐ, ÐÐÐÐ ÐÐÐÐÑÑÐ ÐÐÑÐÐÐÑÐÑÑ ÐÐ ÐÑÐÑÑÑÑÐ "
 "ÑÐÑÐÐ ÑÐÐÐÐÐÑÑÐÐ ÐÐÑÐÐÐÐÐÑ ÐÐÑÐÐÐÐÑ directory"
 
-#: ../data/ui/filesystem-create.ui.h:5
+#: ../data/ui/filesystem-create.ui.h:5
 msgid "F_ilesystem"
 msgstr "_ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
-#: ../data/ui/filesystem-create.ui.h:6
+#: ../data/ui/filesystem-create.ui.h:6
 msgid ""
 "The custom filesystem type to create e.g. <i>btrfs</i>, <i>xfs</i> or "
 "<i>swap</i>"
@@ -489,286 +835,186 @@ msgstr ""
 "ÐÐÐÑÐÐÐ ÑÐÐ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ, ÐÐÐÑÐÐÐÐÐ:  <i>btrfs</i>, <i>xfs</i> ÐÐÐ "
 "<i>swap</i>"
 
-#: ../data/ui/filesystem-create.ui.h:7
+#: ../data/ui/filesystem-create.ui.h:7
 msgid "The custom filesystem type to create e.g. btrfs, xfs or swap"
 msgstr ""
 "ÐÐÐÑÐÐÐ ÑÐÐ ÑÐÐÐÐÐÐÑ ÑÐÑÑÐÐÐ ÐÐÑ ÑÑÐÐÑÐÐÐÑ, ÐÐÐÑÐÐÐÐÐ, btrfs, xfs ÐÐÐ swap"
 
-#: ../data/ui/filesystem-create.ui.h:10
+#: ../data/ui/filesystem-create.ui.h:10
 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 ../data/ui/format-volume-dialog.ui.h:1
 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>"
-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/format-disk-dialog.ui.h:2
+msgid "Format Disk"
+msgstr "ÐÐÑÐÐÑÑÐÐÑÐ ÐÐÑÐ"
 
-#: ../data/ui/palimpsest.ui.h:13
-msgid "Restore Disk Image..."
-msgstr "ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÑÐÐâ"
-
-#: ../data/ui/palimpsest.ui.h:14
-msgid "View SMART Data..."
-msgstr "ÐÐÑÐÐÐÑÐÑÑÐ ÐÐÐÑ SMARTâ"
-
-#: ../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 "ÐÐÑÑÐÐÐ ÐÐÐÐÐ"
-
-#: ../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 "<b>_ÐÐÐÐ</b>"
-
-#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap (version 2)'
-#: ../data/ui/palimpsest.ui.h:33
-msgid "Contents"
-msgstr "ÐÐÐÐÐÐÐÑ"
-
-#: ../data/ui/palimpsest.ui.h:34
-msgid "Device"
-msgstr "ÐÑÐÑÑÑÑÐ"
-
-#: ../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/format-disk-dialog.ui.h:3
+msgid "_Partitioning"
+msgstr "_ÐÐÐÐÑÐÑÐÐÐÐÑ"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:1
-msgid "<big>Restore Disk Image</big>"
-msgstr "<big>ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÑÐÐ</big>"
+#: ../data/ui/format-volume-dialog.ui.h:2
+msgid "Format Volume"
+msgstr "ÐÐÑÐÐÑÑÐÐÑÐ ÑÐÐ"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:2
+#: ../data/ui/restore-disk-image-dialog.ui.h:1
 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
+#: ../data/ui/smart-dialog.ui.h:1
 msgid "_Start Self-test..."
 msgstr "_ÐÐÐÑÑÑÐÑÐ ÑÐÐÐÐÐÐÑÐÐÑÐÐÐÐÑâ"
 
-#: ../data/ui/smart-dialog.ui.h:2
+#: ../data/ui/smart-dialog.ui.h:2
 msgid "_Stop Self-test"
 msgstr "Ð_ÑÐÐÐÐÑÐ ÑÐÐÐÐÐÐÑÐÐÑÐÐÐÐÑ"
 
-#: ../data/ui/smart-dialog.ui.h:3
+#: ../data/ui/smart-dialog.ui.h:3
 msgid "Powered On"
 msgstr "ÐÑÐÑÑÑ"
 
-#: ../data/ui/smart-dialog.ui.h:4
+#: ../data/ui/smart-dialog.ui.h:4
 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
+#. 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/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:6
 msgid "Self-test Result"
 msgstr "ÐÐÐÑÐÑÑÐÑ ÑÐÐÐÐÐÐÑÐÐÑÐÐÐÐÑ"
 
-#: ../data/ui/smart-dialog.ui.h:7
+#: ../data/ui/smart-dialog.ui.h:7
 msgid "Self-assessment"
 msgstr "ÐÐÐÐÐÑÑÐÑÐÐÐÐÑ"
 
-#: ../data/ui/smart-dialog.ui.h:8
+#: ../data/ui/smart-dialog.ui.h:8
 msgid "Overall Assessment"
 msgstr "ÐÐÐÐÐÑÐÐ ÐÑÑÐÑÐÐÐÐÑ"
 
-#. 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:9
+msgid "SMART _Attributes"
+msgstr "_ÐÑÑÐÐÑÑÐ SMART"
+
+#. Translators: This string is used as the column title in the treeview for the value
+#: ../data/ui/smart-dialog.ui.h:10 ../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:11
 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>_ÐÑÑÐÐÑÑÐ SMART</b>"
+#: ../data/ui/smart-dialog.ui.h:12
+msgid "Description"
+msgstr "ÐÐÐÑ"
 
-#: ../data/ui/smart-dialog.ui.h:15
+#: ../data/ui/smart-dialog.ui.h:13
 msgid "Short"
 msgstr "ÐÐÑÐÑÐÐÐ"
 
-#: ../data/ui/smart-dialog.ui.h:16
+#: ../data/ui/smart-dialog.ui.h:14
 msgid "Extended"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ"
 
-#: ../data/ui/smart-dialog.ui.h:17
+#: ../data/ui/smart-dialog.ui.h:15
 msgid "Conveyance"
 msgstr "ÐÐÑÐÐÐÐÐÐÐÑ"
 
-#: ../data/ui/unlock-device-dialog.ui.h:1
-msgid "<big>Enter passphrase to unlock</big>"
-msgstr "<big>ÐÐÐÑÑÐ ÐÐÑÐÐÑ ÐÐÑ ÑÐÐÐÐÐÐÑÐÐÐÐÑ</big>"
+#: ../data/ui/unlock-device-dialog.ui.h:1
+msgid "Enter passphrase to unlock"
+msgstr "ÐÐÐÑÑÐ ÐÐÑÐÐÑ ÐÐÑ ÑÐÐÐÐÐÐÑÐÐÐÐÑ"
 
-#: ../data/ui/unlock-device-dialog.ui.h:4
+#: ../data/ui/unlock-device-dialog.ui.h:4
 msgid "_Unlock"
 msgstr "_ÐÐÐÐÐÐÐÑÐÐÑÐ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:143
+#: ../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 "ÐÐÐÐÐÐÐ Ð'ÑÐÐÐÐÐÑ ÐÐ ÑÐÑÐÐÐ udisks: %s (%s, %d)"
+
+#: ../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 "ÐÐÐÐÐÐÐÐÐ ÐÑÐÐÑÐÑÐ Â%s â ÐÐÐÐÐÐÐ, ÑÐÐ ÐÐ ÐÐÐÐÑÐÐÐÐÐ?"
+
+#: ../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/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"
@@ -776,47 +1022,47 @@ msgstr ""
 "ÐÐÑÑÐÑÐ ÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÑÐ ÑÐÑÐÐÐÑ ÐÐÐÐÑ Ð ÐÐÑÐÐ. ÐÐÐÑÐÑÐÐÐ ÐÐÐÑÐÐÐÑ ÐÐÐÐÑÑ "
 "ÐÐ ÐÐÑÐÐÑÑÑÑ ÐÑÐÐÐÐÐ ÐÐÐ Ð ÐÐÑÐÐÐÐÑ ÐÐÐÐÑÑÐÐÑ ÐÐÐ Ð ÐÐÐÐÐÐÐÐÐ ÑÐÑÐÐÐÑ/ÐÐÐÐÑÑ."
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:153
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 "
@@ -826,190 +1072,185 @@ msgstr ""
 "ÑÐÑÐÐÐÑ/ÐÐÐÐÑÑ/ÐÐÑÐÐÑÑÐÐ, ÐÑÐ ÐÐÐÐÐÑÐÑ ÑÐÐÑÐÑ, ÑÐ \"ÐÐÑÐÐÑÑÐÐÐÐ\" ÑÐ ÐÐÑÐÐÐÑ "
 "ÐÐÐÑ Ñ ÑÐÐÑÑÐÐÑÐÑ ÐÐÑÐÐÐÑÐÐÐÐÐÑ ÐÐÐÐÑÑÑ (ÐÐÐÐÑÐÑ ÐÐÐÐÑÑÑ)."
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:187
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 "ÐÑÐÑÐÑÑÑÑ ÐÐÐÐÐÐÐ, ÑÐÑ ÐÑÐÐ ÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÐÑÐ ÐÐ ÐÐÐÐÐÐÐÐÑ ECC"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:260
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 ""
 "ÐÐÑÐÑÐÐ ÑÐÐÑÐ ÐÐÐÑÐÐÐ ÐÐÐÐÑÑ ÐÐÑÐÐÑÐÐÐÐ ÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÑÐÐÐÑÐÐ ÐÑÐÐÐÐÐÐÐÐ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:268
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../src/disks/gduatasmartdialog.c:260 ../src/disks/gduatasmartdialog.c:430
 msgid "G-sense Error Rate"
 msgstr "ÐÑÑÐÐÐ ÐÐÐÐÐÐÐ G-Sense"
 
-#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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)"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:316
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 "
@@ -1019,14 +1260,14 @@ msgstr ""
 "ÐÐÐÐÐÑÐÑ ÐÑÐÑÐÑÑÑÑ (ÑÑÐÑÑÐÐÑ ÑÐ ÐÐÐÐÐÐÐÑ) ÑÐÑÐÐ ÐÐÑÐÐÐÑÑ ÐÐÐÐÑ Ð "
 "ÐÐÑÐÑÐÐÐÐÐÑÐÐÐÐÑ ÑÐÐÑÐÑÑÐ Ñ ÐÑÐÑÐÑ ÐÐÐÑ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:327
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 "
@@ -1038,14 +1279,14 @@ msgstr ""
 "ÐÐÐÐÑÑÑÑÑÑÑ Ñ ÑÐÐÑÐÑ ÐÐ ÐÐÑÐÐÐÑÐÑÑÑÑ. ÐÐÑÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÑ ÐÐÐÑÑÑ ÐÑÑÐ "
 "ÐÑÐÑÐÐÐÑ ÐÐÑÐÐÐÑÑ ÑÐÐÑÐÑÑ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:339
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 "
@@ -1055,25 +1296,25 @@ msgstr ""
 "ÐÐÐÑÐÑÑÑÑ ÑÐÑÐÐÐÑ/ÐÐÐÐÑÑ Ð ÑÐÐÑÐÑ. ÐÐÑÐÑÑÐÐÐÑ ÐÐÐÑÐÐÐÑ ÑÑÐÐÐ ÐÑÑÐÐÑÑÑ ÐÐÐÐÑÑ "
 "ÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÑÑÐÑ ÐÐÑÐÐ ÑÐ/ÐÐÐ ÐÑÐÐÐÐÐÐ Ñ ÐÐÑÐÐÑÑÐÑÐ ÐÑÐÑÐÑÑÐÐÑ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:349
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 ÐÑÐ ÑÐÐÐÑÑ Ð UDMA ÑÐÐÐÐÑ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:357
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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"
@@ -1081,114 +1322,114 @@ msgstr ""
 "ÐÑÐÑÐÑÑÑÑ ÐÐÐÐÐÐÐ ÐÑÐ ÐÐÐÐÑÑ ÐÐ ÐÐÑÐ (ÐÐÐ) ÐÐÐÐÑÐÐÐÐÐÐÐ ÑÐÐÑÐÐÐ ÐÐÐÐÐÐÐ "
 "(ÐÐÐ) ÐÐÑÐÑ ÐÐÑÐÑÐ ÐÐÐÐÑÑÐÐÑÐÐÐÐÑ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:365
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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 ""
 "ÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÑ ÐÐÑÐÑ ÐÐÐÐÑ ÐÐÐ Ð ÐÐÐÐÐÑÐÐÑ ÐÐÐÐÐÑÐÐÐÑ ÐÐÑÐÐÐÐÐÐÐ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:381
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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"
@@ -1196,32 +1437,32 @@ 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 ""
 "ÐÑÐÑÐÑÑÑÑ ÐÐÐÐÐÐÐ ÑÐ ÑÐÐÑÐÑÑÐÑ ÐÐÐÑÐÑ ÐÐÐÐÐÑ, ÑÐÐÐ ÐÐÑÐÐÐÐÐ ÑÐÐÑÐÑÐÐ "
 "ÐÐÐÐÐÑÐÐÐÐÐÑ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:454
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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"
@@ -1229,71 +1470,71 @@ msgstr ""
 "ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÑÐÐÐÐÑ ÑÐÑÐÑÐÐÐÐÐ ÑÐÑÐÐÑÐÐÐÐ ÐÐÐÑÐÑÑÑÐÐ, ÑÐÑ ÐÐÐÑÐÑÑÑÑÑÑÑ, "
 "ÐÐÐÑÐÐÐÐÐ ÑÐÑÐÐÐÑ, ÐÐÐÐÑ, ÐÐÐÐÑÑÐÐÑÐÐÐÐÑ ÐÐÐÐÐÐÐ ÑÐÑÐ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:471
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../src/disks/gduatasmartdialog.c:495
 msgid "GMR Head Amplitude"
 msgstr "ÐÐÐÐÑÑÑÐÐ GMR ÐÐÐÑÐÐÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:512
+#: ../src/disks/gduatasmartdialog.c:496
 msgid "Amplitude of heads trembling (GMR-head) in running mode"
 msgstr "ÐÐÐÐÑÑÑÐÐ ÐÐÐÐÐÐÐÐÑ ÐÐÐÑÐÐÐ (ÐÐÐÑÐÐÐ GMR) Ñ ÐÐÑÐÐÑÐÑÐÑÑÐÐÐÐÑ ÑÐÐÐÐÑ"
 
-#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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"
@@ -1301,25 +1542,25 @@ msgstr ""
 "ÐÐÑÐÐ ÑÐÐÐÑÐ ÑÑÐÐÑÐÐÐÐ ÐÐÑÐÑÐÐÐÑ ÐÐÐÐÐÐÐÐÑ Ñ ÐÑÐÑÑÑÐÑ Ñ ÐÐÐÐÑÐÑ ÐÑÐÑÐÑÐÑ ÐÑÐ "
 "ÐÐÐÑÐÐÐÐÑÐÐÑ ÐÑÐÑÐÐÑÑÑ ÑÐÐÐÑÐ ÐÐÑÐÑÐÐÐÑ, ÑÐ ÐÑÐÑÑÐÐÑÑÑÑÑÑ ÐÑÐÑÑÑÐÑÐ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:544
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../src/disks/gduatasmartdialog.c:528
 msgid "Uncorrectable ECC Count"
 msgstr "ÐÑÐÑÐÑÑÑÑ ÐÐÐÐÐÑÐÐÐÐÐÐÑ ÐÐÐÐÐÐÐ ECC"
 
-#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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"
@@ -1327,179 +1568,90 @@ msgstr ""
 "ÐÑÐÑÐÑÑÑÑ ÐÐÑÑÑÐÐÐÑ ÑÐÐÐÑÐÐÐÑ ÐÐÐÐÑÐ ÑÐ ÐÑÐÑÐÑÐÐ ÐÑÐ ÐÐÐÐÐÑÐÐÑ ÐÑÐÑÐÐÑÑÑ "
 "ÑÐÐÐÑÐÐÐÑ ÐÐÐÐÑÐ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:561
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
+#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
+#. * or the next string for a longer explanation.
+#.
+#: ../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
-#, c-format
+#: ../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
+#. Translators: Shown in the treeview for a failing attribute
+#: ../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
+#. Translators: Shown in the treeview for an attribute that failed in the past
+#: ../src/disks/gduatasmartdialog.c:674
 msgid "Failed in the past"
 msgstr "ÐÑÐÐ ÐÑÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:694
+#: ../src/disks/gduatasmartdialog.c:678
 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 ÑÐÐÐ"
-msgstr[2] "%.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 ÐÐÑ"
-msgstr[2] "%.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 ÐÐÐÐÐÐ"
-msgstr[2] "%.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 ÑÐÐÐÐÐÐ"
-msgstr[2] "%.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 ÑÐÐÑÐÐÐ"
-msgstr[2] "%.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 ÐÑÐÑÑÐÐÑÐÐÐ"
-msgstr[2] "%.1f ÐÑÐÑÑÐÐÑÐÐ"
-
-#: ../src/palimpsest/gduatasmartdialog.c:764
-#, c-format
+#: ../src/disks/gduatasmartdialog.c:705
+#, c-format
 msgid "%d sector"
 msgid_plural "%d sectors"
 msgstr[0] "ÐÐÐÑÐÑ %d"
 msgstr[1] "ÐÐÐÑÐÑÐ %d"
 msgstr[2] "ÐÐÐÑÐÑÑÐ %d"
 
-#. Translators: Used in the treeview for the pretty/interpreted value of an attribute
-#. * for a temperature-based unit - first %f is the temperature in degrees Celcius, second %f
-#. * is the temperature in degrees Fahrenheit
-#. Translators: Used to format a temperature.
-#. * The first %f is the temperature in degrees Celcius and
-#. * the second %f is the temperature in degrees Fahrenheit.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:776
-#: ../src/palimpsest/gduatasmartdialog.c:1058
-#, c-format
+#. Translators: Used in the treeview for the pretty/interpreted value of an attribute
+#. * for a temperature-based unit - first %f is the temperature in degrees Celcius, second %f
+#. * is the temperature in degrees Fahrenheit
+#. Translators: Used to format a temperature.
+#. * The first %f is the temperature in degrees Celcius and
+#. * the second %f is the temperature in degrees Fahrenheit.
+#.
+#: ../src/disks/gduatasmartdialog.c:717 ../src/disks/gduatasmartdialog.c:929
+#, c-format
 msgid "%.0f C / %.0f F"
 msgstr "%.0f C / %.0f F"
 
-#. SK_SMART_ATTRIBUTE_UNIT_UNKNOWN
-#. Translators: Used in the treeview for the pretty/interpreted value of an attribute
-#. * where the value cannot be interpreted
-#: ../src/palimpsest/gduatasmartdialog.c:787
+#. SK_SMART_ATTRIBUTE_UNIT_UNKNOWN
+#. Translators: Used in the treeview for the pretty/interpreted value of an attribute
+#. * where the value cannot be interpreted
+#: ../src/disks/gduatasmartdialog.c:728
 msgid "N/A"
 msgstr "ÐÐÐÐÑÑÑÐÐÐÐ"
 
-#. 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 "ÐÐÑÐÑÐÐÐÑÑÑÑ Ñ ÐÐÐÐÐÐÑ, ÑÐ ÐÐÑÐ ÐÐÐÐÐ Ð ÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐÐÐ (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
+#. Translators: The first %s is the pretty value (such as '300
+#. * sectors' or '2.5 years' or '53Â C / 127Â F').
+#. *
+#. * The three %d are the normalized, threshold and worst values -
+#. * these are all decimal numbers.
+#.
+#: ../src/disks/gduatasmartdialog.c:774
+#, c-format
 msgid ""
-"Failure is a sign the disk exceeded its intended design life period (Old-Age)"
+"%s <span size=\"small\">(Normalized: %d, Threshold: %d, Worst: %d)</span>"
 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
-#.
-#: ../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 "ÐÐÐÑ"
+"%s <span size=\"small\">(ÐÐÑÐÐÐÑÐÐÐÐÐÐ:%d, ÐÐÑÑÐ: %d, ÐÐÐÐÑÑÑÐ: %d)</span>"
 
-#: ../src/palimpsest/gduatasmartdialog.c:908
-#, c-format
-msgid "%d <span size=\"small\">(Worst:%d, Threshold: %d)</span>"
-msgstr "%d <span size=\"small\">(ÐÐÐÐÑÑÑÐ:%d, ÐÐÑÑÐ: %d)</span>"
-
-#. Translators: Please keep "(Pre-Fail)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:918
+#. Translators: Please keep "(Pre-Fail)" in English
+#.
+#: ../src/disks/gduatasmartdialog.c:784
 msgid ""
 "Failure is a sign the disk will fail within 24 hours <span size=\"small\">"
 "(Pre-Fail)</span>"
@@ -1507,9 +1659,9 @@ msgstr ""
 "ÐÐÑÐÑÐÐÐÑÑÑÑ Ñ ÐÐÐÐÐÐÑ, ÑÐ ÐÐÑÐ ÐÐÐÐÐ Ð ÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐÐÐ <span size=\"small"
 "\">(Pre-Fail)</span>"
 
-#. Translators: Please keep "(Old-Age)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:924
+#. Translators: Please keep "(Old-Age)" in English
+#.
+#: ../src/disks/gduatasmartdialog.c:790
 msgid ""
 "Failure is a sign the disk exceeded its intended design life period <span "
 "size=\"small\">(Old-Age)</span>"
@@ -1517,193 +1669,356 @@ msgstr ""
 "ÐÐÑÐÑÐÐÐÑÑÑÑ Ñ ÐÐÐÐÐÐÑ, ÑÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ ÑÐÑÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐÐÐ ÐÐÑÑÐÐ "
 "<span size=\"small\">(Old-Age)</span>"
 
-#. 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>"
+#. Translators: Please keep "(Online)" in English
+#.
+#: ../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
+#. Translators: Please keep "(Not Online)" in English
+#.
+#: ../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
+#. Translators: shown when the last self-test failed and the problem is with the electrical subsystem
+#: ../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
+#. Translators: shown when the last self-test failed and the problem is with the servo subsystem - see http://en.wikipedia.org/wiki/Servomechanism
+#: ../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
+#. Translators: shown when the last self-test failed and the problem is with the reading subsystem -
+#: ../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
+#. 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/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
-#, c-format
+#. Translators: shown when a self-test is in progress. The first %d is the percentage of the test remaining.
+#: ../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
-#, c-format
+#. Translators: Shown when a self-test is not unknown. The %s is the result-code from the API code.
+#: ../src/disks/gduatasmartdialog.c:882
+#, c-format
 msgctxt "smart-self-test-result"
 msgid "Unknown (%s)"
 msgstr "ÐÐÐÑÐÐÐÐ (%s)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1034
-#, c-format
+#: ../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 "SMART ÐÐ ÐÑÐÑÑÐÐÑÑÑÑÑÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1097
+#: ../src/disks/gduatasmartdialog.c:969
 msgid "SMART is not enabled"
 msgstr "SMART ÐÐ ÐÐÑÐÐÐÐÐÐ"
 
-#: ../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
-#, c-format
+#: ../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] "ÐÐÑÐ ÑÐÑÐÐÐÐÐ, %d ÐÑÑÐÐÑÑ ÐÐÐÐÐÐÐÐÐÐ"
 msgstr[1] "ÐÐÑÐ ÑÐÑÐÐÐÐÐ, %d ÐÑÑÐÐÑÑÐ ÐÐÐÐÐÐÐÐÑ"
 msgstr[2] "ÐÐÑÐ ÑÐÑÐÐÐÐÐ, %d ÐÑÑÐÐÑÑÑÐ ÐÐÐÐÐÐÐÐÑ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1175
-#, c-format
+#: ../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 ÐÐÐÐÐÑ ÑÐÐÑÐÑÐ"
 msgstr[2] "ÐÐÑÐ ÑÐÑÐÐÐÐÐ, %d ÐÐÐÐÐÐÑ ÑÐÐÑÐÑÑÐ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1186
-#, c-format
+#: ../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"
 msgstr[0] "ÐÐÑÐ ÑÐÑÐÐÐÐÐ, %d ÐÑÑÐÐÑÑ ÐÑÐ ÐÐÐÐÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐÑ"
 msgstr[1] "ÐÐÑÐ ÑÐÑÐÐÐÐÐ, %d ÐÑÑÐÐÑÑÐ ÐÑÐÐ ÐÐÐÐÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐÑ"
 msgstr[2] "ÐÐÑÐ ÑÐÑÐÐÐÐÐ, %d ÐÑÑÐÐÑÑÑÐ ÐÑÐÐ ÐÐÐÐÐÐÐÐÐÐÐ Ñ ÐÐÐÑÐÐÐÑ"
 
-#. Translators: Used to convey the status and temperature in one line.
-#. * The first %s is the status of the drive.
-#. * The second %s is the temperature of the drive.
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:1209
-#, c-format
+#. Otherwise, it's all honky dory
+#: ../src/disks/gduatasmartdialog.c:1066
+msgid "Disk is OK"
+msgstr "Ð ÐÐÑÐÐÐ ÑÑÐ ÐÐÑÐÐÐ"
+
+#. Translators: Used to convey the status and temperature in one line.
+#. * The first %s is the status of the drive.
+#. * The second %s is the temperature of the drive.
+#.
+#: ../src/disks/gduatasmartdialog.c:1080
+#, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1364
+#. Translators: XXX
+#: ../src/disks/gduatasmartdialog.c:1235
 msgid "Threshold exceeded"
 msgstr "ÐÐÑÑÐ ÐÐÑÐÐÐÑÐÐÐ"
 
-#. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1369
+#. Translators: XXX
+#: ../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 "ÐÐÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑ ÐÐÐÐÑ SMART"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1460
+#: ../src/disks/gduatasmartdialog.c:1331
 msgid "Error aborting SMART self-test"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐÐÐÑ ÑÐÐÐÑÑÑÐÐÐÐÐ ÑÐÑÑÑÐÐÐÐÑ SMART"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1479
+#: ../src/disks/gduatasmartdialog.c:1350
 msgid "Error starting SMART self-test"
 msgstr "ÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÐÑ ÑÐÐÐÑÑÑÐÐÐÐÐ ÑÐÑÑÑÐÐÐÐÑ SMART"
 
-#. Translators: This string is used as the column title in the treeview for the Attribute ID (0-255)
-#: ../src/palimpsest/gduatasmartdialog.c:1594
+#. Translators: This string is used as the column title in the treeview for the Attribute ID (0-255)
+#: ../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
+#. Translators: This string is used as the column title in the treeview for the attribute name and description
+#: ../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 "%d ÐÐ/Ñ"
+
+#. Translators: This is used in the benchmark graph - %g is number of milliseconds
+#: ../src/disks/gdubenchmarkdialog.c:332
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%3g ms"
+msgstr "%3g ÐÑ"
+
+#. Translators: %s is the formatted size, e.g. "42 MB" and the trailing "/s" means per second
+#: ../src/disks/gdubenchmarkdialog.c:640
+#, c-format
+msgctxt "benchmark-transfer-rate"
+msgid "%s/s"
+msgstr "%s/Ñ"
+
+#: ../src/disks/gdubenchmarkdialog.c:655 ../src/disks/gdubenchmarkdialog.c:954
+#, c-format
+msgid "%d sample"
+msgid_plural "%d samples"
+msgstr[0] "%d ÐÐÐÑÑÐÐ"
+msgstr[1] "%d ÐÐÐÑÑÐÐ"
+msgstr[2] "%d ÐÐÐÑÑÐÐ"
+
+#. 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 "ÐÐÐÑÑÑÐÐÐÐÑ ÑÐÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÐÐÑ (%2.1f%% ÐÐÐÐÑÑÐÐÐ)â"
+
+#: ../src/disks/gdubenchmarkdialog.c:724
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring access time (%2.1f%% complete)..."
+msgstr "ÐÐÐÑÑÑÐÐÐÐÑ ÑÐÑ ÐÐÑÑÑÐÑ (%2.1f%% ÐÐÐÐÑÑÐÐÐ)â"
+
+#: ../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
+#, 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 ÐÐ ÐÑÐ ÐÑÐÑÑÑÐÑ %lld"
+
+#: ../src/disks/gdubenchmarkdialog.c:1392
+#, c-format
+msgctxt "benchmarking"
+msgid "Error writing %lld bytes at offset %lld: %m"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÑÐÐÐÐÑ %lld ÐÐÐÑÑÐ ÐÐ ÐÑÐÑÑÑÐÑ %lld: %m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1402
+#, c-format
+msgctxt "benchmarking"
+msgid "Expected to write %lld bytes, only wrote %lld: %m"
+msgstr "ÐÑÑÐÑÐÐÐÐ ÐÐ ÐÐÐÐÑÑÐÐÐÐÑ %lld ÐÐÐÑÑÐ, ÐÐÐÐÑÐÐÐ %lld: %m"
+
+#: ../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/cryp ÐÐÑÐÐÐÐÐÐÐ"
 
-#: ../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"
@@ -1711,162 +2026,204 @@ 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 "ÐÑÑÐÑÑÑÑ ÐÐÑÐÐÑ"
 
-#. Translators: The suggested name for the disk image to create.
-#. *              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
-#, c-format
+#. Translators: The suggested name for the disk image to create.
+#. *              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/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 "%s Ð %s ÑÐÐÐÑÐÐÐÐÐÐ â %s ÐÐÐÐÑÐÐÐÑÑ (%s/ÑÐÐ)"
+
+#. Translators: string used for convey progress of a copy operation where we don't know time remaining / speed.
+#. * The first two %s are strings with the amount of bytes (ex. "3.4 MB" and "300 MB").
+#.
+#: ../src/disks/gducreatediskimagedialog.c:292
+#: ../src/disks/gdurestorediskimagedialog.c:332
+#, c-format
+msgid "%s of %s copied"
+msgstr "%s Ð %s ÑÐÐÐÑÐÐÐÐÐÐ"
 
-#: ../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
-#, c-format
+#: ../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
-#, c-format
+#: ../src/disks/gducreatediskimagedialog.c:491
+#, c-format
 msgid ""
 "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 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 "ÐÑÐÑÑÐÐÐ Ð ÑÐÑÑÐÐÐÐÐ Linux "
 
-#: ../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 "ÐÐÑÑÐÐÐÐÐÐ, ÑÑÐÑÑÐÐÐ Ð ÑÐÑÑÐÐÐÐÐ Linux"
 
-#: ../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
+#. Translators: this is the default name for the filesystem
+#: ../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>"
@@ -1874,302 +2231,459 @@ msgstr ""
 "ÐÐÑÐ ÐÐÑÐÐÑ, ÑÐÐÐ ÐÐÑÐÐÐÑÑÑÑÑ Ð ÑÐÐÐÐ <i>/etc/crypttab</i>, ÐÑÐÐ ÐÐÑÐÐÐÐ. "
 "ÐÐÐ ÐÐÑÐÐÑÐ ÐÐÑÐÐÑ ÐÐ ÐÐÑÐÑ, ÑÐÐÑÐÑÑÐÐÑÐÑÑ <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
-#, c-format
+#. Translators: This is for a /dev/loop device - %s is the size of the device e.g. "230 MB".
+#: ../src/disks/gdudevicetreemodel.c:1047
+#, c-format
 msgid "%s Loop Device"
 msgstr "ÐÐÐÐÑÑÐÐÐ ÐÑÐÑÑÑÑÐ %s"
 
-#. 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
-#, c-format
+#. Translators: This is for a block device which we failed to categorize  - %s is
+#. * the size of the device e.g. "230 MB".
+#.
+#: ../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 "255 (ÐÐÐÐÐÐÐÐ)"
+
+#: ../src/disks/gdudisksettingsdialog.c:312
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down permitted)"
+msgstr "%d"
+
+#: ../src/disks/gdudisksettingsdialog.c:316
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down not permitted)"
+msgstr "%d (ÑÐÑÑÑÑÐÐÐÐÑ ÐÐ ÐÐÐÐÐÐÐÐÐ)"
+
+#: ../src/disks/gdudisksettingsdialog.c:331
+msgctxt "aam-level"
+msgid "0 (Disabled)"
+msgstr "0 (ÐÐÐÐÐÐÐÐ)"
+
+#: ../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 "ÐÐÐÐÐÐÐÐÑÐ %s"
+
+#. Translators: Used to convey that something takes
+#. * approximately some specificed duration. The %s is a time
+#. * duration e.g. "2 hours and 2 minutes"
+#.
+#: ../src/disks/gduformatdiskdialog.c:116
+#, c-format
+msgid "Approximately %s"
+msgstr "ÐÑÐÐÐÐÐÐÐ %s"
+
+#: ../src/disks/gduformatdiskdialog.c:195
+msgid "ATA Secure Erase"
+msgstr "ÐÐÐÐÐÑÐÐ ÑÑÐÑÐÐÐÑ ATA"
+
+#: ../src/disks/gduformatdiskdialog.c:210
+msgid "ATA Enhanced Secure Erase"
+msgstr "ÐÐÐÑÐÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐ ÑÑÐÑÐÐÐÑ ATA"
+
+#: ../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ÐÐ"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:139
+#: ../src/disks/gduformatdiskdialog.c:266
 msgid "GPT"
 msgstr "GPT"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:151
+#: ../src/disks/gduformatdiskdialog.c:283
 msgid "No partitioning"
 msgstr "ÐÐÐ ÑÐÐÐÑÐÐÐÐÑ"
 
-#: ../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 ""
+"<b>ÐÑÐÐÐÐÐÐ</b>: ÑÐÑÐ ÐÐ ÐÐÐÐÑÑÑÐ ÐÐÑÐÑÐÐÐÑÐ, ÐÑÐÐÐÑÐ ÑÐ ÐÑÐÐÐÑÐ ÐÐÑ ÑÑÐÑÐÐ "
+"ÐÐÐÐ'ÑÑÐÑ ÐÐÐ ÐÐÑÐ, ÑÐÑÐ ÐÐÐÐÑÐÑÑÐÐÑÐÐÑÐ ÑÑÐÐÑÑÑÐÐ ÑÐÐ ÑÑÐÑÐÐÐÑ, ÑÐÐ "
+"ÐÐÐÐÐÑÐÑÐ ÐÐÑÑÐÐÐÑÐÐÑ ÐÑÐÐÐÑÑÐÑ ÑÐÑÐÑÐÐÑÑÑ Ð ÑÑÐÑ ÑÑÐÐ."
+
+#. 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/palimpsest/gduformatdiskdialog.c:233
-#: ../src/palimpsest/gduformatvolumedialog.c:159
+#: ../src/disks/gduformatdiskdialog.c:404
+msgid ""
+"<b>WARNING</b>: The Secure Erase command may take a very long time to "
+"complete, can't be canceled and may not work properly with some hardware. In "
+"the worst case, your drive may be rendered unusable or your system may crash "
+"or lock up. Before proceeding, please read the article about <a "
+"href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ATA Secure "
+"Erase</a> and make sure you understand the risks"
+msgstr ""
+"<b>ÐÐÐÐÐ</b>: ÐÐÐÐÐÐÐ ÐÐÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐÑ ÐÐÐÐ ÐÐÐÑÐÑÐ ÐÐÐÐÑÐ ÑÐÑÑ ÐÐÑ "
+"ÐÐÑÐÑÐÐÐÐÑ, ÑÑ ÐÐÐÐÐÐÐÐÐ ÑÐÐÑÑÐÐÑÐ Ñ ÐÐÐÐ ÐÑÐÑÑÐÐÑÐ ÐÐÐÑÐÐÐÐÑÐÐ Ð ÐÐÐÐÐÐÐ "
+"ÐÑÐÑÑÑÐÑÐÐ. Ð ÐÐÐÐÑÑÑÐÐÑ ÐÐÐÐÐÐÑ, ÐÐÑ ÐÑÐÑÑÑÑÐ ÐÐÐÐ ÐÐÐÑÐÐÐÑÐÐ "
+"ÐÑÐÑÐÐÑÑÐÐÑÐÑÑ ÐÐÐ ÑÐÑÑÐÐÐ ÐÐÐÐ ÐÑÐÑÑÐÐÑÐ ÐÑ ÐÐÐÑÐÐ, ÐÐÐ ÐÐÐÐÐÑÑÐÑÑ. ÐÐÑÐÐ "
+"ÑÐÐ, ÐÑÐÑÐÑÐÐÑÐ ÑÑÐÑÑÑ ÐÑÐ <a "
+"href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ÐÐÐÐÐÑÐÐ "
+"ÑÑÐÑÐÐÐÑ ATA</a> Ñ ÐÐÑÐÐÐÐÐÐÑÐÑÑ, ÑÐ ÐÐ ÑÐÑÐÐÐÑ ÑÐÐÑÐÑÑÑÐ ÑÐÐÐÐÐ"
+
+#: ../src/disks/gduformatdiskdialog.c:411
+#: ../src/disks/gduformatvolumedialog.c:164
 msgid "_Format"
 msgstr "ÐÐÑÐ_aÑÑÐÐÑÐ"
 
-#: ../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
-#, c-format
+#. 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
-#, c-format
+#: ../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 "ÐÐÐÑÐ"
+msgstr "ÐÐÐÐÐÐÐÐÐ"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:172
+#: ../src/disks/gdupasswordstrengthwidget.c:129
+msgctxt "Password strength"
 msgid "Strong"
-msgstr "ÐÐÐÑÐÐÐ"
+msgstr "ÐÐÐÑÐÐÐÐ"
+
+#: ../src/disks/gdurestorediskimagedialog.c:126
+msgid "Error rescanning device"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐÑ ÐÑÐÑÑÑÐÑ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:167
+#: ../src/disks/gdurestorediskimagedialog.c:185
 msgid "Cannot restore image of size 0"
 msgstr "ÐÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ ÑÐÐÐÑÑÑ 0"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:176
-#, c-format
+#: ../src/disks/gdurestorediskimagedialog.c:194
+#, c-format
 msgid "The selected image is %s smaller than the device"
 msgstr "ÐÐÐÑÐÐÐÐ ÐÐÑÐÐ ÐÐ %s ÐÐÐÑÐÐ ÐÐ ÐÑÐÑÑÑÑÐ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:185
-#, c-format
+#: ../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 ÑÐÐÑÐÐÐ"
-msgstr[2] "%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 ÑÐÐÐÐÐÐ"
-msgstr[1] "%d ÑÐÐÐÐÐÐ"
-msgstr[2] "%d ÑÐÐÐÐÐ"
-
-#: ../src/palimpsest/gduutils.c:126
-#, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d ÐÐÐÐÐÐ"
-msgstr[1] "%d ÐÐÐÐÐÐ"
-msgstr[2] "%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:1577
-#, c-format
+#. 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/disks/gduvolumegrid.c:1525
+#, c-format
 msgctxt "volume-grid"
 msgid "Partition %d: %s"
 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:1584
-#, c-format
+#. Translators: This is shown in the volume grid for a partition with no name/label.
+#. *              The %d is the partition number
+#.
+#: ../src/disks/gduvolumegrid.c:1532
+#, c-format
 msgctxt "volume-grid"
 msgid "Partition %d"
 msgstr "ÐÐÐÐÑÐ %d"
 
-#: ../src/palimpsest/gduvolumegrid.c:1604
+#: ../src/disks/gduvolumegrid.c:1552
 msgid "No Media"
 msgstr "ÐÐÐÐÑ ÐÐÑÑÑ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1621
+#: ../src/disks/gduvolumegrid.c:1569
 msgctxt "volume-grid"
 msgid "Free Space"
 msgstr "ÐÑÐÑÐÐ ÐÑÑÑÐ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1663
+#: ../src/disks/gduvolumegrid.c:1611
 msgctxt "volume-grid"
 msgid "Extended Partition"
 msgstr "ÐÐÐÑÐÑÐÐÐÐ ÑÐÐÐÑÐ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1687
+#: ../src/disks/gduvolumegrid.c:1635
 msgctxt "volume-grid"
 msgid "Filesystem"
 msgstr "ÐÐÐÐÐÐÐ ÑÐÑÑÐÐÐ"
 
-#: ../src/palimpsest/gduvolumegrid.c:1706
+#: ../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 "ÐÐÐÐÐÐÐ ÐÐÐÑÑÐÐÐÑ ÑÐÐÐÑÑÐÐÐÐ ÐÑÐÑÑÑÐÑ"
 
-#: ../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
+#. Add a RO check button that defaults to RO
+#: ../src/disks/gduwindow.c:732
 msgid "Set up _read-only loop device"
 msgstr "ÐÐÐÐÑÑÑÐÐÑÐ ÐÐÑÐ ÐÐÑ _ÑÐÑÐÐÐÑ ÑÐÐÐÑÑÐÐÐ ÐÑÐÑÑÑÑÐ"
 
-#: ../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"
@@ -2177,102 +2691,341 @@ msgstr ""
 "ÐÐÑÐ ÐÐÐÐÐÐÐ, ÑÐÐÐÑÑÐÐÐ ÐÑÐÑÑÑÑÐ ÐÑÐÐ ÐÐÑÐ ÐÐÑ ÑÐÑÐÐÐÑ. ÐÐ ÐÑÑÑÐÐ, ÐÐÐÐ ÐÐ "
 "ÐÐ ÐÐÐÐÑÑÐ, ÑÐÐ ÑÐÐÐ ÐÐÑÐÑÐÐÐÑÑ."
 
-#. Translators: Shown for a read-only device. The %s is the device file, e.g. /dev/sdb1
-#: ../src/palimpsest/gduwindow.c:1515
-#, c-format
+#. Translators: Shown for a read-only device. The %s is the device file, e.g. /dev/sdb1
+#: ../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 "ÐÐÐÐÑÐÐÐÑÑ %s "
+
+#. 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
+#. Translators: Use for mount point '/' simply because '/' is too small to hit as a hyperlink
+#.
+#: ../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
-#, c-format
+#. Translators: Shown next to "In Use". The first %s is the mount point, e.g. /media/foobar
+#: ../src/disks/gduwindow.c:2274
+#, c-format
 msgid "Yes, mounted at %s"
 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
+#. 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/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
+#. 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/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
-#, c-format
+#. 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/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
+#. Translators: used to convey free space for partitions (partition table format not known)
+#: ../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 "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 
-#~ msgid "Reset"
-#~ msgstr "ÐÑÐÐÐÐÑÑÑÐÑÐ"
+#: ../src/disks/gduwindow.c:3227
+msgid "Error setting autoclear flag"
+msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÑÑÑÐÐÐÐÑ ÐÑÐÐÐÑÑÑÐ ÐÐÑÐÐÐÑÐÑÐÐÐÐ ÐÑÐÑÐÐÐÑ"
+
+#: ../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 ÑÐÐÐ"
+msgstr[2] "%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 ÑÐÐÐÐÐÐ"
+msgstr[2] "%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 ÐÐÑ"
+msgstr[2] "%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 ÐÐÐÐÐÐ"
+msgstr[2] "%d ÐÐÐÐÐ"
+
+#. Translators: Used for number of minutes
+#: ../src/libgdu/gduutils.c:431
+#, c-format
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d ÑÐÐÐÐÐÐ"
+msgstr[1] "%d ÑÐÐÐÐÐÐ"
+msgstr[2] "%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 ÑÐÐÑÐÐÐ"
+msgstr[2] "%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 ÐÑÐÑÑÐÐÑÐÐÐ"
+msgstr[2] "%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 "%s, %s Ñ %s"
+
+#. Translators: Used for durations less than one year but greater than one month. First %s is number of months, second %s is days
+#: ../src/libgdu/gduutils.c:514
+#, c-format
+msgctxt "duration-months-to-year"
+msgid "%s and %s"
+msgstr "%s Ñ %s"
+
+#. Translators: Used for durations less than one month but greater than one day. First %s is number of days, second %s is hours
+#: ../src/libgdu/gduutils.c:519
+#, c-format
+msgctxt "duration-day-to-month"
+msgid "%s and %s"
+msgstr "%s Ñ %s"
+
+#. Translators: Used for durations less than one day but greater than one hour. First %s is number of hours, second %s is minutes
+#: ../src/libgdu/gduutils.c:524
+#, c-format
+msgctxt "duration-hour-to-day"
+msgid "%s and %s"
+msgstr "%s Ñ %s"
+
+#. Translators: Used for durations less than one hour but greater than one minute. First %s is number of minutes, second %s is seconds
+#: ../src/libgdu/gduutils.c:535
+#, c-format
+msgctxt "duration-minute-to-hour"
+msgid "%s and %s"
+msgstr "%s Ñ %s"
+
+#: ../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 "%s"
+
+#. Translators: Used for durations less than one second. First %s is number of milli-seconds
+#: ../src/libgdu/gduutils.c:555
+#, c-format
+msgctxt "duration-zero-to-second"
+msgid "%s"
+msgstr "%s"
+
+#~ msgid "<big>Change Passphrase</big>"
+#~ msgstr "<big>ÐÐÑÐÐÑÐ ÐÐÑÐÐÑ</big>"
+
+#~ msgid "<big>Create Disk Image</big>"
+#~ msgstr "<big>ÐÑÐÐÑÐÑÐ ÐÐÑÐÐ ÐÐÑÐÐ</big>"
+
+#~ msgid "<big>Create Partition</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>"
+
+#~ msgid "<big>Format Volume</big>"
+#~ msgstr "<big>ÐÐÑÐÐÑÑÐÐÑÐ ÑÐÐ</big>"
+
+#~ msgid "<b>_Volumes</b>"
+#~ msgstr "<b>_ÐÐÐÐ</b>"
+
+#~ msgid "<big>Restore Disk Image</big>"
+#~ msgstr "<big>ÐÑÐÐÐÐÐÑÐ ÐÐÑÐÐ ÐÐÑÐÐ</big>"
+
+#~ msgid "Updates"
+#~ msgstr "ÐÐÐÐÐÐÐÐÐÑ"
+
+#~ msgid "Normalized"
+#~ msgstr "ÐÐÑÐÐÐÑÐÐÐÐÐÐ"
+
+#~ msgid "%.1f hour"
+#~ msgid_plural "%.1f hours"
+#~ msgstr[0] "%.1f ÐÐÐÐÐÐ"
+#~ msgstr[1] "%.1f ÐÐÐÐÐÐ"
+#~ msgstr[2] "%.1f ÐÐÐÐÐ"
+
+#~ msgid "%.1f minute"
+#~ msgid_plural "%.1f minutes"
+#~ msgstr[0] "%.1f ÑÐÐÐÐÐÐ"
+#~ msgstr[1] "%.1f ÑÐÐÐÐÐÐ"
+#~ msgstr[2] "%.1f ÑÐÐÐÐÐ"
+
+#~ msgid "%.1f second"
+#~ msgid_plural "%.1f seconds"
+#~ msgstr[0] "%.1f ÑÐÐÑÐÐÐ"
+#~ msgstr[1] "%.1f ÑÐÐÑÐÐÐ"
+#~ msgstr[2] "%.1f ÑÐÐÑÐÐ"
+
+#~ msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
+#~ msgstr ""
+#~ "ÐÐÑÐÑÐÐÐÑÑÑÑ Ñ ÐÐÐÐÐÐÑ, ÑÐ ÐÐÑÐ ÐÐÐÐÐ Ð ÐÐÐÑ ÐÑÐÑÑÐÐÐ ÐÐÐÐ (Pre-Fail)"
+
+#~ msgid ""
+#~ "Failure is a sign the disk exceeded its intended design life period (Old-"
+#~ "Age)"
+#~ msgstr ""
+#~ "ÐÐÑÐÑÐÐÐÑÑÑÑ Ñ ÐÐÐÐÐÐÑ, ÑÐ ÐÐÑÐ ÐÐÑÐÐÐÑÐÐ ÑÐÑÐ ÐÐÐÐÐÐÐÐÐÐÐÐ ÐÐÑÑÑÐÐÐ "
+#~ "ÐÐÑÑÐÐ (Old-Age)"
+
+#~ msgid "Every time data is collected (Online)"
+#~ msgstr "ÐÐÐÐÐÐÐ ÑÐÐÑ ÐÐÐÑ ÐÐÐÑÐÑÑÑÑÑ (Online)"
+
+#~ msgid "Only during off-line activities (Not Online)"
+#~ msgstr "ÐÐÑÐ ÐÑÐ ÑÐÑ ÐÐÐÐÐÑÐÐÐÐÐÑ ÐÑÑÐÑÐÐÑÑÑ (Not Online)"
+
+#~ msgid "Name"
+#~ msgstr "ÐÐÐÐÐ"
+
+#~ msgid "Copying data from device <i>%s</i>..."
+#~ msgstr "ÐÐÐÑÑÐÐÐÐÑ ÐÐÐÐÑ Ð ÐÑÐÑÑÑÐÑ <i>%s</i>â"
+
+#~ msgid "All data on the volume will be lost"
+#~ msgstr "ÐÑÑ ÐÐÐÑ ÑÐÐÑ ÐÑÐÐ ÐÑÑÐÑÐÐÐ"
+
+#~ msgid "Copying data to device <i>%s</i>..."
+#~ msgstr "ÐÐÐÑÑÐÐÐÐÑ ÐÐÐÐÑ ÐÐ ÐÑÐÑÑÑÑÐ <i>%s</i>â"
 
 #~ msgid "What's this?"
 #~ msgstr "ÐÐ ÑÐ ÑÐÐÐ?"
@@ -2304,12 +3057,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "%d seconds"
 #~ msgstr "%d ÑÐÐÑÐÐ"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d ÑÐÐÐÐÐ"
-
-#~ msgid "%d hours"
-#~ msgstr "%d ÐÐÐÐÐ"
-
 #~ msgid "Disk Utility"
 #~ msgstr "ÐÐÑÐÐÐÑ ÐÐÑÐÐÐ"
 
@@ -2350,9 +3097,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Gnome Disk Utility formatting tool"
 #~ msgstr "ÐÐÑÑÐ ÐÐÑ ÑÐÑÐÐÑÑÐÐÐÐÑ Gnome Disk Utility"
 
-#~ msgid "Format partition %d of %s (%s)"
-#~ msgstr "ÐÐÑÐÐÑÑÐÐÑÐ ÑÐÐÐÑÐ %d ÐÐ %s (%s)"
-
 #~ msgid "Formatting partition %d of %s (%s)"
 #~ msgstr "ÐÐÑÐÐÑÑÑ ÑÐÐÐÑÐ %d ÐÐ %s (%s)"
 
@@ -2362,9 +3106,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Formatting %s (%s)"
 #~ msgstr "ÐÐÑÐÐÑÑÐÐÐÐÑ %s (%s)"
 
-#~ msgid "Format %s Volume (%s)"
-#~ msgstr "ÐÐÑÐÐÑÑÐÐÑÐ ÑÐÐ %s (%s)"
-
 #~ msgid "Formatting %s Volume (%s)"
 #~ msgstr "ÐÐÑÐÐÑÑÑ ÑÐÐ %s (%s)..."
 
@@ -2591,9 +3332,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Choose Server"
 #~ msgstr "ÐÐÐÐÑÑÑÑ ÑÐÑÐÐÑ"
 
-#~ msgid "Connect to Server"
-#~ msgstr "Ð'ÑÐÐÐÐÐÑ Ð ÑÐÑÐÐÑÐÐ"
-
 #~ msgid "_Browse..."
 #~ msgstr "_ÐÐÐÑÐ..."
 
@@ -2642,9 +3380,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "The pool of devices"
 #~ msgstr "ÐÑÐ ÐÑÐÑÑÑÐÑÐ"
 
-#~ msgid "RAID Level"
-#~ msgstr "ÐÑÐÐÐÑ RAID"
-
 #~ msgid "The selected RAID level"
 #~ msgstr "ÐÐÑÐÐÐÐ ÑÑÐÐÐÑ RAID"
 
@@ -2660,9 +3395,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "The size of each component"
 #~ msgstr "ÐÐÐÐÑÑ ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐÐÑÑ"
 
-#~ msgid "Stripe Size"
-#~ msgstr "ÐÐÐÐÑÑ Stripe"
-
 #~ msgid "The requested stripe size of the array"
 #~ msgstr "ÐÐÐÐÑÑ Stripe ÐÐÑÐÐÐÐÐÐ ÐÐÑÐÐÑ"
 
@@ -2767,9 +3499,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Array of selected drives"
 #~ msgstr "ÐÐÑÐÐ Ð ÐÐÑÐÐÐÑ ÐÑÐÑÑÑÐÑÐ"
 
-#~ msgid "Number of available disks"
-#~ msgstr "ÐÑÐÑÐÑÑÑÑ ÐÐÑÑÑÐÐÐÑ ÐÐÑÐÑÐ"
-
 #~ msgid "Largest Segment For Selected"
 #~ msgstr "ÐÐÐÐÑÐÑÑÐÐ ÑÐÐÐÐÐÑ ÐÐÑ ÐÐÐÑÐÐÐÑ"
 
@@ -2850,9 +3579,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Are you sure you want to start a read/write benchmark?"
 #~ msgstr "ÐÐ ÐÐÐÐÑ, ÑÐ ÑÐÑÐÑÐ ÐÐÐÑÑÑÐÑÐ ÐÐÐÑÑ ÑÐÐÐÐÐÐÑÑ?"
 
-#~ msgid "_Benchmark"
-#~ msgstr "_ÐÐÐÑÑ ÑÐÐÐÐÐÐÑÑ"
-
 #~ msgid "%s (%s) â Benchmark"
 #~ msgstr "%s (%s) â ÐÐÐÑÑ ÑÐÐÐÐÐÐÑÑ"
 
@@ -2868,18 +3594,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Maximum Write Rate:"
 #~ msgstr "ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐ ÐÐÐÐÑÑ:"
 
-#~ msgid "Average Read Rate:"
-#~ msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÐ ÑÐÑÐÐÐÑ:"
-
-#~ msgid "Average Write Rate:"
-#~ msgstr "ÐÐÑÐÐÐÑÐ ÐÐÐÐ ÐÐÐÐÑÑ:"
-
-#~ msgid "Last Benchmark:"
-#~ msgstr "ÐÑÑÐÐÐÑÐ ÐÐÐÑÑ ÑÐÐÐÐÐÐÑÑ:"
-
-#~ msgid "Average Access Time:"
-#~ msgstr "ÐÐÑÐÐÐÑÐ ÑÐÑ ÐÐÑÑÑÐÑ:"
-
 #~ msgid "Start _Read-Only Benchmark"
 #~ msgstr "ÐÐÐÑÑÑÐÑÐ ÐÐÑÐÐÑÑÐÑ ÑÐÐÐÐÐÐÑÑ Ñ ÑÐÐÐÐÑ _ÑÐÑÐÐÐÑ"
 
@@ -2892,15 +3606,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Measure read rate, write rate and access time"
 #~ msgstr "ÐÐÐÑÑÑÑÐ ÑÐÐÐÐÑÑÑÑ ÑÐÑÐÐÐÑ, ÑÐÐÐÐÑÑÑÑ ÐÐÐÐÑÑ ÑÐ ÑÐÑ ÐÐÑÑÑÐÑ"
 
-#~ msgid "%d MB/s"
-#~ msgstr "%d ÐÐ/Ñ"
-
-#~ msgid "%3g ms"
-#~ msgstr "%3g ÐÑ"
-
-#~ msgid "Never"
-#~ msgstr "ÐÑÐÐÐÐ"
-
 #~ msgid "Cancels the currently running benchmark"
 #~ msgstr "ÐÐÐÑÐÐÑÑ ÐÐÑÐÑÐÐÐ ÐÐÐÑÑÐÐÐÐ ÑÐÑÑ"
 
@@ -3157,9 +3862,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ "ÐÐÐÐ ÐÐÐ ÐÐÐÑÐÑÐÐ ÐÑÐÐÑÐÐ ÐÐÐÐÑÐÑÑÐÐÑÑÑÑ ÑÐÐ. ÐÐÐÐÐÑÑÑ ÐÑÐÐÑÐÐÐ, ÑÐ ÐÐÐÐÑ "
 #~ "ÑÐÑÐÐÑÐÑÐ ÐÑÐ'ÑÐÐÐÑÐ ÑÐÐ."
 
-#~ msgid "_Unmount"
-#~ msgstr "_ÐÑÐ'ÑÐÐÐÑÐ"
-
 #~ msgid "Passphrases do not match"
 #~ msgstr "ÐÐÑÐÐÑ ÐÐ ÐÐÑÐÐÑÑÑÑÑ"
 
@@ -3339,9 +4041,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "HDDVD"
 #~ msgstr "HDDVD"
 
-#~ msgid "%s %s Drive"
-#~ msgstr "%s ÐÐÑÐ %s"
-
 #~ msgid "%s Hard Disk"
 #~ msgstr "%s ÐÐÑÑÑÐÐÐ ÐÐÑÐ"
 
@@ -3481,9 +4180,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Error enumerating adapters: %s"
 #~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑ ÑÐÐÑÐÑ ÐÐÐÐÑÐÑÑÐ: %s"
 
-#~ msgid "Error enumerating expanders: %s"
-#~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑ ÑÐÐÑÐÑ ÑÐÐÑÐÑÑÐÐÑÑÐ: %s"
-
 #~ msgid "Error enumerating ports: %s"
 #~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐ ÑÐÐÐÐÐÐÐÑ ÑÐÐÑÐÑ ÐÐÑÑÑÐ: %s"
 
@@ -3517,9 +4213,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Error logging in"
 #~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐ ÐÑÐÐÑ"
 
-#~ msgid "Error sending `%s': %s"
-#~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐ ÐÐÐÑÐÐÐÐÐÑ `%s': %s"
-
 #~ msgid ""
 #~ "Unexpected stderr output - expected `udisks-tcp-bridge: Waiting for "
 #~ "secret' but got `%s'"
@@ -3672,9 +4365,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Deleting Partition"
 #~ msgstr "ÐÐÐÑÑÐÐÐÑ ÑÐÐÐÑÐÑ"
 
-#~ msgid "Creating Partition"
-#~ msgstr "ÐÑÐÐÑÐÐÐÑ ÑÐÐÐÑÐÑ"
-
 #~ msgid "Modifying Partition"
 #~ msgstr "ÐÐÑÐÐ ÑÐÐÐÑÐÑ"
 
@@ -3861,9 +4551,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Unused Partition"
 #~ msgstr "ÐÐÐÐÑÐ ÐÐ ÐÐÐÐÑÐÑÑÐÐÑÑÑÑÑÑ"
 
-#~ msgid "Empty Partition"
-#~ msgstr "ÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐ"
-
 #~ msgid "Driver Partition"
 #~ msgstr "ÐÐÐÐÑÐ Driver"
 
@@ -4119,9 +4806,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Unknown"
 #~ msgstr "ÐÐÐÑÐÐÐÐ"
 
-#~ msgid "%s at %s"
-#~ msgstr "%s ÐÑ ÑÐÐÐÐÑÑÑÑ %s"
-
 #~ msgctxt "RAID level"
 #~ msgid "Stripe (RAID-0)"
 #~ msgstr "Stripe (RAID-0)"
@@ -4461,10 +5145,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Enabled"
 #~ msgstr "ÐÐÑÐÐÐÐÐÐ"
 
-#~ msgctxt "Write Cache"
-#~ msgid "Disabled"
-#~ msgstr "ÐÐÐÐÐÐÐÐ"
-
 #~ msgctxt "Rotation Rate"
 #~ msgid "%d RPM"
 #~ msgstr "%d ÐÐ/ÑÐ"
@@ -4476,9 +5156,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Unknown Scheme: %s"
 #~ msgstr "ÐÐÐÑÐÐÐÐ ÑÑÐÐÐ: %s"
 
-#~ msgid "Error launching Brasero"
-#~ msgstr "ÐÐÐÐÐÐÐ ÐÑÐ ÑÐÑ ÐÐÐÑÑÐÑ Brasero"
-
 #~ msgid "The application is not installed"
 #~ msgstr "ÐÑÐÐÑÐÐÑ ÐÐ ÐÑÑÐÐÐÐÐÐÐÐ"
 
@@ -4502,9 +5179,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Firmware Version:"
 #~ msgstr "ÐÐÑÑÑÑ ÐÑÐÑÐÐÑÐÐÑÐÐ:"
 
-#~ msgid "Location:"
-#~ msgstr "ÐÐÑÐÑÐ:"
-
 #~ msgid "Write Cache:"
 #~ msgstr "ÐÐÑ ÐÐÐÐÑÑ:"
 
@@ -4927,24 +5601,12 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Delete the partition"
 #~ msgstr "ÐÐÐÑÑÐÑÐ ÑÐÐÐÑÐ"
 
-#~ msgid "_Lock Volume"
-#~ msgstr "_ÐÐÐÐÑÐÐÑÐ ÑÐÐ"
-
-#~ msgid "Make encrypted data unavailable"
-#~ msgstr "ÐÑÐÐÐÑÐ ÑÐÑÑÐÐÐÐÑ ÐÐÐÑ ÐÐÐÐÑÑÑÐÐÐÐÐ"
-
 #~ msgid "Un_lock Volume"
 #~ msgstr "_ÐÐÐÐÐÐÐÑÐÐÑÐ ÑÐÐ"
 
 #~ msgid "Forge_t Passphrase"
 #~ msgstr "_ÐÐÐÑÑÐ ÐÐÑÐÐÑ"
 
-#~ msgid "Delete passphrase from keyring"
-#~ msgstr "ÐÐÐÑÑÐÑÐ ÐÐÑÐÐÑ ÑÐ Ð'ÑÐÐÐ ÐÐÑÑÑÐ"
-
-#~ msgid "Change passphrase"
-#~ msgstr "ÐÐÑÐÐÑÐ ÐÐÑÐÐÑ"
-
 #~ msgid "_Create Logical Volume"
 #~ msgstr "_ÐÑÐÐÑÐÑÐ ÐÐÐÑÑÐÐÐ ÑÐÐ"
 
@@ -5020,9 +5682,6 @@ msgstr "ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐÑ ÑÐÐÐÑÐÐÑ"
 #~ msgid "Get Help on Disk Utility"
 #~ msgstr "ÐÐÐÑÐÐÑÐ ÐÐÐÑÐÐÑ ÐÑÐ ÐÐÑÐÐÐÑ ÐÐÑÐÐÐ"
 
-#~ msgid "An error occured"
-#~ msgstr "ÐÐÐÐÐÐÐ ÐÐÐÐÐÐÐ"
-
 #~ msgid "The operation failed."
 #~ msgstr "ÐÐÐÑÐÑÑÑ ÐÐÐÐÐÐÐ ÐÐÐÐÐÑÑ."
 



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