[gnome-disk-utility] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 12156c71440281e630ff1c4284df4172428f3362
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Thu Jul 12 09:07:46 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 2370 +++++++++++++++++++++++++++++++++++++---------------------
 po/zh_TW.po | 2412 ++++++++++++++++++++++++++++++++++++++---------------------
 2 files changed, 3059 insertions(+), 1723 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 6722404..94c338f 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-disk-utility 3.3.93\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-08 16:02+0800\n"
-"PO-Revision-Date: 2012-03-08 16:03+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2012-07-12 09:07+0800\n"
+"PO-Revision-Date: 2012-07-12 09:07+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,16 +18,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/palimpsest.desktop.in.h:1 ../data/ui/about-dialog.ui.h:3
-#: ../src/palimpsest/gduwindow.c:888
+#: ../data/gnome-disk-image-mounter.desktop.in.h:1
+#: ../src/disk-image-mounter/main.c:98
+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:992
 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:1
+#: ../data/ui/about-dialog.ui.h:2
 msgid ""
 "Copyright  2008-2012 Red Hat, Inc.\n"
 "Copyright  2008-2012 David Zeuthen"
@@ -47,339 +56,657 @@ msgstr ""
 "zh-l10n lists linux org tw\n"
 "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2011."
 
-#: ../data/ui/change-passphrase-dialog.ui.h:1
-msgid "<big>Change Passphrase</big>"
-msgstr "<big>æèåè</big>"
+#: ../data/ui/app-menu.ui.h:1
+msgid "Attach Disk _Image..."
+msgstr "éåççæåæ(_I)â"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:2
-#: ../data/ui/edit-dos-partition-dialog.ui.h:3
+#: ../data/ui/app-menu.ui.h:2
+msgid "_About Disks"
+msgstr "éæçç(_A)"
+
+#: ../data/ui/app-menu.ui.h:3
+msgid "_Quit"
+msgstr "éé(_Q)"
+
+#: ../data/ui/benchmark-dialog.ui.h:1
+msgid "_Start Benchmark..."
+msgstr "éåæèèæ(_S)â"
+
+#: ../data/ui/benchmark-dialog.ui.h:2
+msgid "_Abort Benchmark"
+msgstr "éææèèæ(_A)"
+
+#: ../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 "éåæèèæ(_S)â"
+
+#: ../data/ui/benchmark-dialog.ui.h:10
+msgid ""
+"Benchmarking involves measuring the transfer rate on various area of the "
+"device as well as measuring how long it takes to seek from one random area "
+"to another. Please back up important data before using the write benchmark."
+msgstr "Benchmarking ååæéèçåååååçåèçäååäåäæåååæåäåäæåèèåäæéãåäçååèæäåèååäéèçèæã"
+
+#: ../data/ui/benchmark-dialog.ui.h:11
+msgid "<b>Transfer Rate</b>"
+msgstr "<b>åèç</b>"
+
+#: ../data/ui/benchmark-dialog.ui.h:12
+msgid "Number of S_amples"
+msgstr "åæçæç(_A)"
+
+#: ../data/ui/benchmark-dialog.ui.h:13
+msgid "Sample S_ize (MiB)"
+msgstr "åæçåå(M_iB)"
+
+#: ../data/ui/benchmark-dialog.ui.h:14
+msgid "Also perform _write-benchmark"
+msgstr "äéèååçæèèæ(_W)"
+
+#: ../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 "æåææèèå/ååç MiB æ (1048576 äåç)ãååæææççèæççèæçæïäåææèèèåçæéã"
+
+#: ../data/ui/benchmark-dialog.ui.h:20
+msgid "<b>Access Time</b>"
+msgstr "<b>ååæé</b>"
+
+#: ../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:2
-#: ../data/ui/edit-partition-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 "æè(_H)"
 
+#: ../data/ui/change-passphrase-dialog.ui.h:2
+msgid "<big>Change Passphrase</big>"
+msgstr "<big>æèåè</big>"
+
 #: ../data/ui/change-passphrase-dialog.ui.h:3
-#: ../data/ui/filesystem-create.ui.h:1
-msgid "C_onfirm Passphrase"
-msgstr "çèåè(_O)"
+msgid "Curr_ent Passphrase"
+msgstr "çåçåè(_E)"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:4
-#: ../data/ui/filesystem-create.ui.h:2
-msgid "Check this box to see the passphrases entered above"
-msgstr "æåéåæååäçåäéèåçåè"
+msgid "Enter current passphrase used to protect the data"
+msgstr "èåçåçääèèæçåè"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:5
-#: ../data/ui/filesystem-create.ui.h:3
-msgid "Confirm passphrase entered above"
-msgstr "çèäéèåçåè"
+#: ../data/ui/filesystem-create.ui.h:12
+msgid "Sho_w Passphrases"
+msgstr "éçåè(_W)"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:6
-msgid "Curr_ent Passphrase"
-msgstr "çåçåè(_E)"
+#: ../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
-msgid "Enter current passphrase used to protect the data"
-msgstr "èåçåçääèèæçåè"
+#: ../data/ui/filesystem-create.ui.h:11
+msgid "Confirm passphrase entered above"
+msgstr "çèäéèåçåè"
 
 #: ../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
-msgid "New _Passphrase"
-msgstr "æçåè(_N)"
+#: ../data/ui/filesystem-create.ui.h:9
+msgid "C_onfirm Passphrase"
+msgstr "çèåè(_O)"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:10
-#: ../data/ui/filesystem-create.ui.h:6
-msgid "Sho_w Passphrases"
-msgstr "éçåè(_W)"
+msgid "New _Passphrase"
+msgstr "æçåè(_N)"
 
 #: ../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 "Copying data to disk image..."
-msgstr "æåèèèæåççæåæâ"
+msgid "_Start Creating..."
+msgstr "éååç(_S)â"
 
 #: ../data/ui/create-disk-image-dialog.ui.h:3
+#: ../data/ui/edit-crypttab-dialog.ui.h:3
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:5
+#: ../data/ui/filesystem-create.ui.h:2
+msgid "_Name"
+msgstr "åç(_N)"
+
+#: ../data/ui/create-disk-image-dialog.ui.h:4
 msgid "Save in _folder"
 msgstr "ååæèæå(_F)"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:4
+#: ../data/ui/create-disk-image-dialog.ui.h:5
 msgid "Select a Folder"
 msgstr "éæèæå"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:5
-#: ../data/ui/edit-crypttab-dialog.ui.h:12
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:13
-#: ../data/ui/filesystem-create.ui.h:11
-msgid "_Name"
-msgstr "åç(_N)"
-
 #: ../data/ui/create-disk-image-dialog.ui.h:6
-msgid "_Start Creating..."
-msgstr "éååç(_S)â"
+msgid "Copying data to disk image..."
+msgstr "æåèèèæåççæåæâ"
 
 #: ../data/ui/create-partition-dialog.ui.h:1
-msgid "<big>Contents</big>"
-msgstr "<big>åå</big>"
+msgid "C_reate"
+msgstr "åç(_R)"
 
 #: ../data/ui/create-partition-dialog.ui.h:2
 msgid "<big>Create Partition</big>"
 msgstr "<big>åçååå</big>"
 
 #: ../data/ui/create-partition-dialog.ui.h:3
-msgid "C_reate"
-msgstr "åç(_R)"
+msgid "Partition _Size"
+msgstr "ååååé(_S)"
 
 #: ../data/ui/create-partition-dialog.ui.h:4
-msgid "Free Space _Following"
-msgstr "åççåççé(_F)"
+msgid "The size of the partition to create, in megabytes"
+msgstr "èåççååååéïä MB è"
 
 #: ../data/ui/create-partition-dialog.ui.h:5
 msgid "MB"
 msgstr "MB"
 
 #: ../data/ui/create-partition-dialog.ui.h:6
-msgid "Partition _Size"
-msgstr "ååååé(_S)"
+msgid "Free Space _Following"
+msgstr "åççåççé(_F)"
 
 #: ../data/ui/create-partition-dialog.ui.h:7
 msgid "The free space following the partition, in megabytes"
 msgstr "åååååçåéçéïä MB è"
 
 #: ../data/ui/create-partition-dialog.ui.h:8
-msgid "The size of the partition to create, in megabytes"
-msgstr "èåççååååéïä MB è"
-
-#: ../data/ui/edit-crypttab-dialog.ui.h:1
-msgid ""
-"If checked, additional authorization is required to unlock the device [x-"
-"udisks-auth]"
-msgstr "åææåæééïæèæéåçéèäèéèç [x-udisks-auth]"
+msgid "<big>Contents</big>"
+msgstr "<big>åå</big>"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:2
-msgid "If checked, the device will be unlocked at startup [!noauto]"
-msgstr "åææåæééïèçæåååååæèé [!noauto]"
+#: ../data/ui/disk-settings-dialog.ui.h:1
+msgid "_Standby Timeout"
+msgstr "ååéæ(_S)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:3
-msgid "Opt_ions"
-msgstr "éé(_I)"
+#: ../data/ui/disk-settings-dialog.ui.h:2
+msgid "Enter Standby After"
+msgstr "éååååçå"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:4
-msgid "Options to use when unlocking the device"
-msgstr "èéèçæäççéé"
+#: ../data/ui/disk-settings-dialog.ui.h:3
+msgid "_Advanced Power Management"
+msgstr "éééæçç(_A)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:5
-msgid "Passphrase File"
-msgstr "åèææ"
+#: ../data/ui/disk-settings-dialog.ui.h:4
+msgid "APM Level"
+msgstr "APM åç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:6
+#: ../data/ui/disk-settings-dialog.ui.h:5
 msgid ""
-"Passphrase of the device or empty to request from user when setting up the "
-"device"
-msgstr "èççåèïæäæççäåèåèçæèæäçè"
+"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/edit-crypttab-dialog.ui.h:7
-msgid "Require additional authori_zation to unlock"
-msgstr "éèéåéèäèé(_Z)"
+#: ../data/ui/disk-settings-dialog.ui.h:6
+msgid "Automatic Aco_ustic Management"
+msgstr "èååéçç(_U)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:8
-#: ../data/ui/unlock-device-dialog.ui.h:2
-msgid "Sho_w passphrase"
-msgstr "éçåè(_W)"
+#: ../data/ui/disk-settings-dialog.ui.h:7
+msgid "Vendor Recommended"
+msgstr "åèçåå"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:9
-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>/"
-"etc/crypttab</b> file"
-msgstr "éé<i>èåååéé</i> äççèççååééèåèãééåæè <b>/etc/crypttab</b> ææåçæç"
+#: ../data/ui/disk-settings-dialog.ui.h:8
+msgid "AAM Level"
+msgstr "AAM åç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:10
-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>/ äèç"
+#: ../data/ui/disks.ui.h:1
+msgid "Create a new partition..."
+msgstr "åçæçåååâ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:11
-msgid "_Automatic Encryption Options"
-msgstr "èåååéé(_A)"
+#: ../data/ui/disks.ui.h:2
+msgid "Mount the filesystem"
+msgstr "æèææçç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:13
-#: ../data/ui/filesystem-create.ui.h:12 ../data/ui/unlock-device-dialog.ui.h:3
-msgid "_Passphrase"
-msgstr "åè(_P)"
+#: ../data/ui/disks.ui.h:3
+msgid "Unmount the filesystem"
+msgstr "åèææçç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:14
-msgid "_Unlock at startup"
-msgstr "ååååæèé(_U)"
+#: ../data/ui/disks.ui.h:4
+msgid "Eject the media"
+msgstr "éåéååé"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:1
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
-#: ../data/ui/edit-partition-dialog.ui.h:1
-msgid "<big>Edit Partition</big>"
-msgstr "<big>çèååå</big>"
+#: ../data/ui/disks.ui.h:5
+msgid "Unlock the encrypted device"
+msgstr "èéååçèç"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:2
-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 "
-"the <i>active</i> partition"
-msgstr "åèéæèåçåçäèæåäèèå OS æççææãææååæéåææçåååäèèç <i>active</i> ååå"
+#: ../data/ui/disks.ui.h:6
+msgid "Activate the swap space"
+msgstr "åççæåçé"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:4
-msgid "The partition type as a 8-bit unsigned integer"
-msgstr "åååéåç 8 äåæçççææ"
+#: ../data/ui/disks.ui.h:7
+msgid "Deactivate the swap space"
+msgstr "åççæåçé"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:5
-msgid "_Bootable"
-msgstr "åéæ(_B)"
+#: ../data/ui/disks.ui.h:8
+msgid "Lock the encrypted device"
+msgstr "éåååçèç"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:6
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:16
-#: ../data/ui/edit-partition-dialog.ui.h:3
-#: ../data/ui/filesystem-create.ui.h:13
-msgid "_Type"
-msgstr "éå(_T)"
+#: ../data/ui/disks.ui.h:9
+msgid "More actions..."
+msgstr "æååäâ"
 
-#: ../data/ui/edit-filesystem-dialog.ui.h:1
-msgid "<big>Change Filesystem Label</big>"
-msgstr "<big>æèææççæç</big>"
+#: ../data/ui/disks.ui.h:10
+msgid "Delete partition..."
+msgstr "åéåååâ"
 
-#: ../data/ui/edit-filesystem-dialog.ui.h:3
-msgid "_Label"
-msgstr "æç(_L)"
+#: ../data/ui/disks.ui.h:11
+msgid "Attach Disk Image..."
+msgstr "éåççæåæâ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:1
-msgid "Display _Name"
-msgstr "éçåç(_N)"
+#: ../data/ui/disks.ui.h:12
+msgid "Detach Disk Image"
+msgstr "åéççæåæ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:2
-msgid "Filesystem _Type"
-msgstr "ææççéå(_T)"
+#: ../data/ui/disks.ui.h:13
+msgid "Select a device"
+msgstr "éæèç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:3
-msgid "I_dentify As"
-msgstr "èåç(_A)"
+#: ../data/ui/disks.ui.h:14
+msgid "Model"
+msgstr "åè"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:4
-msgid "Icon Na_me"
-msgstr "åçåç(_M)"
+#: ../data/ui/disks.ui.h:15
+msgid "Serial Number"
+msgstr "åè"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:5
-msgid ""
-"If checked, additional authorization is required to mount the device [x-"
-"udisks-auth]"
-msgstr "åææåæééïæèæéåçéèäæèèç [x-udisks-auth]"
+#: ../data/ui/disks.ui.h:16
+msgid "World Wide Name"
+msgstr "äçæåç(WWN)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:6
-msgid ""
-"If checked, the device is always shown in the user interface no matter what "
-"its directory is [x-gvfs-show]"
-msgstr "åææåæééïèçæéæéçåäçèäéäïäçåççéçä [x-gvfs-show]"
+#. 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/edit-fstab-dialog.ui.h:7
-msgid "If checked, the device will be mounted at startup [!noauto]"
-msgstr "åææåæééïèçäæåååååææè [!noauto]"
+#: ../data/ui/disks.ui.h:19
+msgid "Media"
+msgstr "åé"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:8
+#: ../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:1517
+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 "<b>_Volumes</b>"
+msgstr "<b>ååå(_V)</b>"
+
+#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap (version 2)'
+#: ../data/ui/disks.ui.h:26
+msgid "Contents"
+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/disks.ui.h:47
+msgid "Benchmark Volume..."
+msgstr "ååååèæâ"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:1
+msgid "_Automatic Encryption Options"
+msgstr "èåååéé(_A)"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:2
 msgid ""
-"If set, the name of the icon to use in the device in the user interface [x-"
-"gvfs-icon=]"
-msgstr "åæèåïåççåçæçåäçèäéçèçä [x-gvfs-icon=]"
+"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>/"
+"etc/crypttab</b> file"
+msgstr "éé<i>èåååéé</i> äççèççååééèåèãééåæè <b>/etc/crypttab</b> ææåçæç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:9
+#: ../data/ui/edit-crypttab-dialog.ui.h:4
+msgid "Opt_ions"
+msgstr "éé(_I)"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:5
 msgid ""
-"If set, the name to use for the device in the user interface [x-gvfs-name=]"
-msgstr "åæèåïéåèçåäçèäéääççåç [x-gvfs-name=]"
+"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>/ äèç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:10
-msgid "Mount Opt_ions"
-msgstr "æèéé(_I)"
+#: ../data/ui/edit-crypttab-dialog.ui.h:6
+msgid "Options to use when unlocking the device"
+msgstr "èéèçæäççéé"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:11
-msgid "Mount _Point"
-msgstr "æèé(_P)"
+#: ../data/ui/edit-crypttab-dialog.ui.h:7
+msgid "Passphrase File"
+msgstr "åèææ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:12
-msgid "Mount at _startup"
-msgstr "ååååææè(_S)"
+#: ../data/ui/edit-crypttab-dialog.ui.h:8
+#: ../data/ui/unlock-device-dialog.ui.h:3
+msgid "Sho_w passphrase"
+msgstr "éçåè(_W)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:13
-msgid "Require additional authori_zation to mount"
-msgstr "éèéåéèæèæè(_Z)"
+#: ../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-fstab-dialog.ui.h:14
-msgid "Sho_w in user interface"
-msgstr "éçäçèäé(_W)"
+#: ../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 "åè(_P)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:15
+#: ../data/ui/edit-crypttab-dialog.ui.h:11
+msgid "_Unlock at startup"
+msgstr "ååååæèé(_U)"
+
+#: ../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
+msgid "Require additional authori_zation to unlock"
+msgstr "éèéåéèäèé(_Z)"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:14
+msgid ""
+"If checked, additional authorization is required to unlock the device [x-"
+"udisks-auth]"
+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: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 "éå(_T)"
+
+#: ../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
+msgid "_Bootable"
+msgstr "åéæ(_B)"
+
+#: ../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 "
+"the <i>active</i> partition"
+msgstr "åèéæèåçåçäèæåäèèå OS æççææãææååæéåææçåååäèèç <i>active</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:3
+msgid "_Label"
+msgstr "æç(_L)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:1
+msgid "_Automatic Mount Options"
+msgstr "èåæèéé(_A)"
+
+#: ../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/"
 "fstab</b> file"
 msgstr "éé<i>èåååéé</i> äççèççæèéèæèééãééåæè <b>>/etc/fstab</b> ææåçæç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:16
+#: ../data/ui/edit-fstab-dialog.ui.h:3
+msgid "I_dentify As"
+msgstr "èåç(_A)"
+
+#: ../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"
 msgstr "<b>çåçèçææ</b> - äçå <b>/dev/disk</b> éåéçäçèéçäæåéçççå"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:17
+#: ../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"
+msgstr "çåçèçææ - äçå /dev/disk éåéçäçèéçäæåéçççå"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:6
+msgid "Mount _Point"
+msgstr "æèé(_P)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:7
+msgid "Filesystem _Type"
+msgstr "ææççéå(_T)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:8
 msgid "The directory to mount the device in"
 msgstr "çäæèèçççé"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:18
+#: ../data/ui/edit-fstab-dialog.ui.h:9
 msgid "The filesystem type to use"
 msgstr "èäççææççéå"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:19
-msgid "The mount options stored in the <b>/etc/fstab</b> file"
-msgstr "ååæ <b>/etc/fstab</b> ææäçæèéé"
+#: ../data/ui/edit-fstab-dialog.ui.h:10
+msgid "Display _Name"
+msgstr "éçåç(_N)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:20
+#: ../data/ui/edit-fstab-dialog.ui.h:11
 msgid ""
-"The special device file - use symlinks in the /dev/disk hierarchy to control "
-"the scope of the entry"
-msgstr "çåçèçææ - äçå /dev/disk éåéçäçèéçäæåéçççå"
+"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:21
-msgid "_Automatic Mount Options"
-msgstr "èåæèéé(_A)"
+#: ../data/ui/edit-fstab-dialog.ui.h:12
+msgid "Icon Na_me"
+msgstr "åçåç(_M)"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:3
-msgid "Do Not _Automount"
-msgstr "äèèåæè(_A)"
+#: ../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-gpt-partition-dialog.ui.h:4
-msgid "H_idden"
-msgstr "éè(_I)"
+#: ../data/ui/edit-fstab-dialog.ui.h:14
+msgid "Sho_w in user interface"
+msgstr "éçäçèäé(_W)"
 
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:5
+#: ../data/ui/edit-fstab-dialog.ui.h:15
 msgid ""
-"If set, some OSes may hide the contents of the partition in their user "
-"interfaces"
-msgstr "åæèåïæä OS æåååçäçèäéäéèåååçåå"
+"If checked, the device is always shown in the user interface no matter what "
+"its directory is [x-gvfs-show]"
+msgstr "åææåæééïèçæéæéçåäçèäéäïäçåççéçä [x-gvfs-show]"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:16
+msgid "Require additional authori_zation to mount"
+msgstr "éèéåéèæèæè(_Z)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:17
+msgid ""
+"If checked, additional authorization is required to mount the device [x-"
+"udisks-auth]"
+msgstr "åææåæééïæèæéåçéèäæèèç [x-udisks-auth]"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:18
+msgid "Mount at _startup"
+msgstr "ååååææè(_S)"
+
+#: ../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
+msgid "Mount Opt_ions"
+msgstr "æèéé(_I)"
+
+#: ../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
+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
 msgid ""
-"If set, some OSes may mount or use the contents of the partition as read-"
-"only instead of read-write"
-msgstr "åæèåïæä OS æäåèèéåèåçæåæèæäçåååçåå"
+"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> "
+"directory"
+msgstr "ååååç (æå 36 åèåçåç)ãåæäæèéé <b>/dev/disk/by-partlabel</b> çéäççèéçäåçèççèæåæç"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:7
-msgid "If set, some OSes may not automount the contents of the partition"
-msgstr "åæèåïæä OS åèäæèåæèéååååçåå"
+msgid "_System partition"
+msgstr "ççååå(_S)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:8
 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"
-msgstr "åçç BIOS éæèæãéçåæäéæçé(MBR)ç <i>bootable</i> ææãåéååçæå MBR ççääç GPT åååæ"
+"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 "
+"overwrite the contents"
+msgstr "çäèçéååååååäçååæ OS/åèéäæéçãèçåææäèåéæèèéäåå"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:9
 msgid "Legacy BIOS _Bootable"
@@ -387,315 +714,172 @@ msgstr "åç _BIOS éæååå"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:10
 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> "
-"directory"
-msgstr "ååååç (æå 36 åèåçåç)ãåæäæèéé <b>/dev/disk/by-partlabel</b> çéäççèéçäåçèççèæåæç"
+"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"
+msgstr "åçç BIOS éæèæãéçåæäéæçé(MBR)ç <i>bootable</i> ææãåéååçæå MBR ççääç GPT åååæ"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:11
-msgid "The partition type represented as a 32-bit <i>GUID</i>"
-msgstr "åååéåæä 32 äå <i>GUID</i> äåç"
+msgid "_Read-Only"
+msgstr "åè(_R)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:12
 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 "
-"overwrite the contents"
-msgstr "çäèçéååååååäçååæ OS/åèéäæéçãèçåææäèåéæèèéäåå"
+"If set, some OSes may mount or use the contents of the partition as read-"
+"only instead of read-write"
+msgstr "åæèåïæä OS æäåèèéåèåçæåæèæäçåååçåå"
+
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:13
+msgid "H_idden"
+msgstr "éè(_I)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:14
-msgid "_Read-Only"
-msgstr "åè(_R)"
+msgid ""
+"If set, some OSes may hide the contents of the partition in their user "
+"interfaces"
+msgstr "åæèåïæä OS æåååçäçèäéäéèåååçåå"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:15
-msgid "_System partition"
-msgstr "ççååå(_S)"
+msgid "Do Not _Automount"
+msgstr "äèèåæè(_A)"
+
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:16
+msgid "If set, some OSes may not automount the contents of the partition"
+msgstr "åæèåïæä OS åèäæèåæèéååååçåå"
+
+#: ../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"
+msgstr "ææççäççåçãåæäæèéé <b>/dev/disk/by-label</b> çéäççèéçåçèççèæåæåå"
 
 #: ../data/ui/filesystem-create.ui.h:4
-msgid "Enter passphrase used to protect the data"
-msgstr "èåçääèèæçåè"
+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"
+msgstr "ææççäççåçãåæäæèéé /dev/disk/by-label çéäççèéçåçèççèæåæåå"
 
 #: ../data/ui/filesystem-create.ui.h:5
 msgid "F_ilesystem"
 msgstr "ææçç(_I)"
 
-#: ../data/ui/filesystem-create.ui.h:7
+#: ../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>"
 msgstr "èåççèéææççéåïäå <i>btrfs</i>ã<i>xfs</i> æ <i>swap</i>"
 
-#: ../data/ui/filesystem-create.ui.h:8
+#: ../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:9
-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"
-msgstr "ææççäççåçãåæäæèéé /dev/disk/by-label çéäççèéçåçèççèæåæåå"
-
 #: ../data/ui/filesystem-create.ui.h:10
-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"
-msgstr "ææççäççåçãåæäæèéé <b>/dev/disk/by-label</b> çéäççèéçåçèççèæåæåå"
+msgid "Enter passphrase used to protect the data"
+msgstr "èåçääèèæçåè"
 
-#: ../data/ui/format-disk-dialog.ui.h:1
-msgid "<big>Format Disk</big>"
-msgstr "<big>æååçç</big>"
+#: ../data/ui/filesystem-create.ui.h:14 ../data/ui/format-disk-dialog.ui.h:4
+msgid "_Erase"
+msgstr "æé(_E)"
 
-#: ../data/ui/format-disk-dialog.ui.h:2 ../data/ui/format-volume-dialog.ui.h:2
+#: ../data/ui/format-disk-dialog.ui.h:1 ../data/ui/format-volume-dialog.ui.h:1
 msgid "_Format..."
 msgstr "æåå(_F)â"
 
+#: ../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 "ååå(_P)"
 
-#: ../data/ui/format-volume-dialog.ui.h:1
+#: ../data/ui/format-volume-dialog.ui.h:2
 msgid "<big>Format Volume</big>"
 msgstr "<big>æååååå</big>"
 
-#: ../data/ui/palimpsest.ui.h:1
-msgid "<b>_Volumes</b>"
-msgstr "<b>ååå(_V)</b>"
-
-#: ../data/ui/palimpsest.ui.h:2
-msgid "Activate the swap space"
-msgstr "åççæåçé"
-
-#. Translators: This string is used as the column title in the treeview for the assessment of the attribute
-#: ../data/ui/palimpsest.ui.h:3 ../src/palimpsest/gduatasmartdialog.c:1632
-msgid "Assessment"
-msgstr "èä"
-
-#: ../data/ui/palimpsest.ui.h:4
-msgid "Attach Disk Image..."
-msgstr "éåççæåæâ"
-
-#. The filename or URI of the file that is used as backing store for the loop device.
-#: ../data/ui/palimpsest.ui.h:6
-msgid "Backing File"
-msgstr "åäææ"
-
-#: ../data/ui/palimpsest.ui.h:7
-msgid "Change Passphrase..."
-msgstr "ææåèâ"
-
-#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap (version 2)'
-#: ../data/ui/palimpsest.ui.h:9
-msgid "Contents"
-msgstr "åå"
-
-#: ../data/ui/palimpsest.ui.h:10
-msgid "Create Disk Image..."
-msgstr "åçççæåæâ"
-
-#: ../data/ui/palimpsest.ui.h:11
-msgid "Create a new partition..."
-msgstr "åçæçåååâ"
-
-#: ../data/ui/palimpsest.ui.h:12
-msgid "Deactivate the swap space"
-msgstr "åççæåçé"
-
-#: ../data/ui/palimpsest.ui.h:13
-msgid "Delete partition..."
-msgstr "åéåååâ"
-
-#: ../data/ui/palimpsest.ui.h:14
-msgid "Detach Disk Image"
-msgstr "åéççæåæ"
-
-#: ../data/ui/palimpsest.ui.h:15
-msgid "Device"
-msgstr "èç"
-
-#: ../data/ui/palimpsest.ui.h:16
-msgid "Edit Encryption Options..."
-msgstr "çèååéé..."
-
-#: ../data/ui/palimpsest.ui.h:17
-msgid "Edit Filesystem Label..."
-msgstr "çèææççæçâ"
-
-#: ../data/ui/palimpsest.ui.h:18
-msgid "Edit Mount Options..."
-msgstr "çèæèéé..."
-
-#: ../data/ui/palimpsest.ui.h:19
-msgid "Edit Partition Type..."
-msgstr "çèåååéåâ"
-
-#: ../data/ui/palimpsest.ui.h:20
-msgid "Eject media"
-msgstr "éååé"
-
-#: ../data/ui/palimpsest.ui.h:21
-msgid "Eject the media"
-msgstr "éåéååé"
-
-#: ../data/ui/palimpsest.ui.h:22
-msgid "Format Disk..."
-msgstr "æååççâ"
-
-#: ../data/ui/palimpsest.ui.h:23
-msgid "Format..."
-msgstr "æååâ"
-
-#: ../data/ui/palimpsest.ui.h:24
-msgid "In Use"
-msgstr "äçä"
-
-#: ../data/ui/palimpsest.ui.h:25
-msgid "Lock the encrypted device"
-msgstr "éåååçèç"
-
-#: ../data/ui/palimpsest.ui.h:26
-msgid "Media"
-msgstr "åé"
-
-#: ../data/ui/palimpsest.ui.h:27
-msgid "Model"
-msgstr "åè"
-
-#: ../data/ui/palimpsest.ui.h:28
-msgid "More actions..."
-msgstr "æååäâ"
-
-#: ../data/ui/palimpsest.ui.h:29
-msgid "Mount the filesystem"
-msgstr "æèææçç"
-
-#: ../data/ui/palimpsest.ui.h:30
-msgid "Partition Type"
-msgstr "åååéå"
-
-#: ../data/ui/palimpsest.ui.h:31
-msgid "Restore Disk Image..."
-msgstr "éåççæåæâ"
-
-#: ../data/ui/palimpsest.ui.h:32
-msgid "Select a device"
-msgstr "éæèç"
-
-#: ../data/ui/palimpsest.ui.h:33
-msgid "Serial Number"
-msgstr "åè"
-
-#: ../data/ui/palimpsest.ui.h:34
-msgid "Size"
-msgstr "åé"
-
-#: ../data/ui/palimpsest.ui.h:35
-msgid "Unlock the encrypted device"
-msgstr "èéååçèç"
-
-#: ../data/ui/palimpsest.ui.h:36
-msgid "Unmount the filesystem"
-msgstr "åèææçç"
-
-#: ../data/ui/palimpsest.ui.h:37
-msgid "View SMART Data..."
-msgstr "æè SMART èæâ"
-
-#: ../data/ui/palimpsest.ui.h:38
-#, fuzzy
-msgid "World Wide Name"
-msgstr "äçæåç(WWN):"
-
 #: ../data/ui/restore-disk-image-dialog.ui.h:1
 msgid "<big>Restore Disk Image</big>"
 msgstr "<big>éåççæåæ</big>"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:2
-msgid "Copying data to device..."
-msgstr "èèèæèèçâ"
+msgid "_Image to restore"
+msgstr "èéåçæåæ(_I)"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:3
 msgid "Select Disk Image to restore"
 msgstr "éæèéåçççæåæ"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:4
-msgid "_Image to restore"
-msgstr "èéåçæåæ(_I)"
+msgid "Copying data to device..."
+msgstr "èèèæèèçâ"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:5
 msgid "_Start Restoring..."
 msgstr "éåéå(_S)â"
 
 #: ../data/ui/smart-dialog.ui.h:1
-msgid "<b>SMART _Attributes</b>"
-msgstr "<b>SM_ART åæ</b>"
+msgid "_Start Self-test..."
+msgstr "éåèææè(_S)â"
 
 #: ../data/ui/smart-dialog.ui.h:2
-msgid "Conveyance"
-msgstr "èé"
+msgid "_Stop Self-test"
+msgstr "åæèææè(_S)"
 
 #: ../data/ui/smart-dialog.ui.h:3
-msgid "Extended"
-msgstr "åäç"
+msgid "Powered On"
+msgstr "èåæ"
 
 #: ../data/ui/smart-dialog.ui.h:4
-msgid "Normalized"
-msgstr "æåå"
+msgid "Updated"
+msgstr "åææ"
 
-#: ../data/ui/smart-dialog.ui.h:5
-msgid "Overall Assessment"
-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/disks/gduatasmartdialog.c:298
+#: ../src/disks/gduatasmartdialog.c:517
+msgid "Temperature"
+msgstr "æå"
 
 #: ../data/ui/smart-dialog.ui.h:6
-msgid "Powered On"
-msgstr "èåæ"
+msgid "Self-test Result"
+msgstr "èææèçæ"
 
 #: ../data/ui/smart-dialog.ui.h:7
 msgid "Self-assessment"
 msgstr "èæèä"
 
 #: ../data/ui/smart-dialog.ui.h:8
-msgid "Self-test Result"
-msgstr "èææèçæ"
+msgid "Overall Assessment"
+msgstr "æéèä"
 
 #: ../data/ui/smart-dialog.ui.h:9
-msgid "Short"
-msgstr "ç"
+msgid "SMART _Attributes"
+msgstr "SM_ART åæ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../data/ui/smart-dialog.ui.h:10 ../src/palimpsest/gduatasmartdialog.c:300
-#: ../src/palimpsest/gduatasmartdialog.c:519
-msgid "Temperature"
-msgstr "æå"
+#. 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:1505
+msgid "Value"
+msgstr "æå"
 
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../data/ui/smart-dialog.ui.h:11 ../src/palimpsest/gduatasmartdialog.c:863
+#: ../data/ui/smart-dialog.ui.h:11
 msgid "Type"
 msgstr "éå"
 
 #: ../data/ui/smart-dialog.ui.h:12
-msgid "Updated"
-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:14 ../src/palimpsest/gduatasmartdialog.c:865
-msgid "Updates"
-msgstr "ææ"
+msgid "Description"
+msgstr "èæ"
 
-#. Translators: This string is used as the column title in the treeview for the value
-#: ../data/ui/smart-dialog.ui.h:15 ../src/palimpsest/gduatasmartdialog.c:1620
-msgid "Value"
-msgstr "æå"
+#: ../data/ui/smart-dialog.ui.h:13
+msgid "Short"
+msgstr "ç"
 
-#: ../data/ui/smart-dialog.ui.h:16
-msgid "_Start Self-test..."
-msgstr "éåèææè(_S)â"
+#: ../data/ui/smart-dialog.ui.h:14
+msgid "Extended"
+msgstr "åäç"
 
-#: ../data/ui/smart-dialog.ui.h:17
-msgid "_Stop Self-test"
-msgstr "åæèææè(_S)"
+#: ../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>"
@@ -705,14 +889,107 @@ msgstr "<big>èåèééåçåè</big>"
 msgid "_Unlock"
 msgstr "èé(_U)"
 
+#: ../src/disk-image-mounter/main.c:96
+msgid "An error occurred"
+msgstr "æéèçç"
+
+#: ../src/disk-image-mounter/main.c:118
+msgid "Allow writing to the image"
+msgstr "åèååæåæ"
+
+#: ../src/disk-image-mounter/main.c:119
+msgid "Wait until created loop devices are cleared"
+msgstr "çååååççèåèçèæéçæ"
+
+#: ../src/disk-image-mounter/main.c:139 ../src/disks/gduutils.c:87
+msgid "All Files"
+msgstr "ææææ"
+
+#: ../src/disk-image-mounter/main.c:143 ../src/disks/gduutils.c:91
+msgid "Disk Images (*.img, *.iso)"
+msgstr "ççæåæ (*.img, *.iso)"
+
+#: ../src/disk-image-mounter/main.c:159
+msgid "Select Disk Image(s) to Mount"
+msgstr "éæèæèçççæåæ"
+
+#: ../src/disk-image-mounter/main.c:163
+msgid "_Mount"
+msgstr "æè(_M)"
+
+#. Add a RO check button that defaults to RO
+#: ../src/disk-image-mounter/main.c:169
+msgid "Set up _read-only mount"
+msgstr "èååèæè(_R)"
+
+#: ../src/disk-image-mounter/main.c:170
+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:213
+#, c-format
+msgid "Error connecting to udisks daemon: %s (%s, %d)"
+msgstr "éçè udisks äæçåæççéèï%s (%s, %d)"
+
+#: ../src/disk-image-mounter/main.c:221
+msgid "Attach and mount one or more disk image files."
+msgstr "éåäæèäæååççæåæã"
+
+#: ../src/disk-image-mounter/main.c:274
+#, c-format
+msgid "Cannot open `%s' - maybe the volume isn't mounted?"
+msgstr "äèéåã%sã- åèæåååææèæèï"
+
+#: ../src/disk-image-mounter/main.c:281
+#, c-format
+msgid "Error opening `%s': %m"
+msgstr "éå ã%sãæççéèï%m"
+
+#: ../src/disk-image-mounter/main.c:302
+#, c-format
+msgid "Error attaching disk image: %s (%s, %d)"
+msgstr "éåççæåææççéèï%s (%s, %d)"
+
+#: ../src/disk-image-mounter/main.c:349
+#, c-format
+msgid "Error mounting filesystem on partition %d of disk image: %s (%s, %d)"
+msgstr "æèççææåæçååå %d çææççæççéèï%s (%s, %d)"
+
+#: ../src/disk-image-mounter/main.c:364
+#, c-format
+msgid ""
+"The file `%s' does not appear to contain a mountable filesystem or partition "
+"table"
+msgstr "ææã%sãääææåååæèçææççæååè"
+
+#: ../src/disk-image-mounter/main.c:375
+#, c-format
+msgid "Error mounting filesystem: %s (%s, %d)"
+msgstr "æèææççæççéèï%s (%s, %d)"
+
+#. this is not fatal but can happen when using FUSE crap where uid 0 is
+#. * not permitted to view files on a FUSE mount
+#.
+#: ../src/disk-image-mounter/main.c:402
+#, c-format
+msgid "Non-fatal error: error setting autoclear to TRUE: %s (%s, %d)\n"
+msgstr "éåééèïéèèåèåæéç TRUEï%s (%s, %d)\n"
+
+#: ../src/disk-image-mounter/main.c:417
+#, c-format
+msgid "Error cleaning up loop device: %s (%s, %d)"
+msgstr "æé loop èçæççéèï%s (%s, %d)"
+
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:143
+#: ../src/disks/gduatasmartdialog.c:141
 msgid "Read Error Rate"
 msgstr "èåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:144
+#: ../src/disks/gduatasmartdialog.c:142
 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"
@@ -721,44 +998,44 @@ msgstr "åççèåååèææççéèçéçãééçæåä
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:153
+#: ../src/disks/gduatasmartdialog.c:151
 msgid "Throughput Performance"
 msgstr "èæåèéæè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:154
+#: ../src/disks/gduatasmartdialog.c:152
 msgid "Average efficiency of the disk"
 msgstr "ççæçååæè"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:161
+#: ../src/disks/gduatasmartdialog.c:159
 msgid "Spinup Time"
 msgstr "ééååæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:162
+#: ../src/disks/gduatasmartdialog.c:160
 msgid "Time needed to spin up the disk"
 msgstr "ååçççäèééæéçæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:169
+#: ../src/disks/gduatasmartdialog.c:167
 msgid "Start/Stop Count"
 msgstr "åå/åæææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:170
+#: ../src/disks/gduatasmartdialog.c:168
 msgid "Number of spindle start/stop cycles"
 msgstr "äèééåå/åæåçæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:177
+#: ../src/disks/gduatasmartdialog.c:175
 msgid "Reallocated Sector Count"
 msgstr "éæåéçåæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:178
+#: ../src/disks/gduatasmartdialog.c:176
 msgid ""
 "Count of remapped sectors. When the hard drive finds a read/write/"
 "verification error, it marks the sector as \"reallocated\" and transfers "
@@ -768,114 +1045,110 @@ msgstr "éææåçåçææãçççççèå/åå/æééè
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:187
+#: ../src/disks/gduatasmartdialog.c:185
 msgid "Read Channel Margin"
 msgstr "èåéééç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:188
+#: ../src/disks/gduatasmartdialog.c:186
 msgid "Margin of a channel while reading data."
 msgstr "èåèææééçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:195
+#: ../src/disks/gduatasmartdialog.c:193
 msgid "Seek Error Rate"
 msgstr "æåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:196
+#: ../src/disks/gduatasmartdialog.c:194
 msgid "Frequency of errors while positioning"
 msgstr "ååäæççéèçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:203
+#: ../src/disks/gduatasmartdialog.c:201
 msgid "Seek Timer Performance"
 msgstr "æåèæåæè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:204
+#: ../src/disks/gduatasmartdialog.c:202
 msgid "Average efficiency of operations while positioning"
 msgstr "åäææäçååæè"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:211
-#: ../src/palimpsest/gduatasmartdialog.c:536
+#: ../src/disks/gduatasmartdialog.c:209 ../src/disks/gduatasmartdialog.c:534
 msgid "Power-On Hours"
 msgstr "ççééçèåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:212
-#: ../src/palimpsest/gduatasmartdialog.c:537
+#: ../src/disks/gduatasmartdialog.c:210 ../src/disks/gduatasmartdialog.c:535
 msgid "Number of hours elapsed in the power-on state"
 msgstr "éåèæééçæçåææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:219
+#: ../src/disks/gduatasmartdialog.c:217
 msgid "Spinup Retry Count"
 msgstr "éééèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:220
+#: ../src/disks/gduatasmartdialog.c:218
 msgid "Number of retry attempts to spin up"
 msgstr "éæåèååäèééçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:227
+#: ../src/disks/gduatasmartdialog.c:225
 msgid "Calibration Retry Count"
 msgstr "ææéèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:228
+#: ../src/disks/gduatasmartdialog.c:226
 msgid "Number of attempts to calibrate the device"
 msgstr "åèææèççææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:235
+#: ../src/disks/gduatasmartdialog.c:233
 msgid "Power Cycle Count"
 msgstr "éæåçææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:236
+#: ../src/disks/gduatasmartdialog.c:234
 msgid "Number of power-on events"
 msgstr "ååéæääçæç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:243
+#: ../src/disks/gduatasmartdialog.c:241
 msgid "Soft read error rate"
 msgstr "èäèåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:245
-#, fuzzy
-#| msgid "Frequency of 'program' errors while reading from the disk"
+#: ../src/disks/gduatasmartdialog.c:243
 msgid "Frequency of errors while reading from the disk"
-msgstr "åççèåæãçåãççéèçéç"
+msgstr "åççèåæççéèçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:252
+#: ../src/disks/gduatasmartdialog.c:250
 msgid "Reported Uncorrectable Errors"
 msgstr "åååçæææéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:253
+#: ../src/disks/gduatasmartdialog.c:251
 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
+#: ../src/disks/gduatasmartdialog.c:258
 msgid "High Fly Writes"
 msgstr "ééèåå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:261
+#: ../src/disks/gduatasmartdialog.c:259
 msgid ""
 "Number of times a recording head is flying outside its normal operating range"
 msgstr "èåçééèèéæåæäçåæçææ"
@@ -883,73 +1156,70 @@ msgstr "èåçééèèéæåæäçåæçææ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:268
+#: ../src/disks/gduatasmartdialog.c:266
 msgid "Airflow Temperature"
 msgstr "æææå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:269
+#: ../src/disks/gduatasmartdialog.c:267
 msgid "Airflow temperature of the drive"
 msgstr "ççæçæææå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:276
-#: ../src/palimpsest/gduatasmartdialog.c:446
+#: ../src/disks/gduatasmartdialog.c:274 ../src/disks/gduatasmartdialog.c:444
 msgid "G-sense Error Rate"
 msgstr "G-åæåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:277
+#: ../src/disks/gduatasmartdialog.c:275
 msgid "Frequency of mistakes as a result of impact loads"
 msgstr "ççççææéæéèçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:284
-#: ../src/palimpsest/gduatasmartdialog.c:503
+#: ../src/disks/gduatasmartdialog.c:282 ../src/disks/gduatasmartdialog.c:501
 msgid "Power-off Retract Count"
 msgstr "æéçéåæææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:285
+#: ../src/disks/gduatasmartdialog.c:283
 msgid "Number of power-off or emergency retract cycles"
 msgstr "éæäææçæåæçéçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:292
-#: ../src/palimpsest/gduatasmartdialog.c:479
+#: ../src/disks/gduatasmartdialog.c:290 ../src/disks/gduatasmartdialog.c:477
 msgid "Load/Unload Cycle Count"
 msgstr "çéèå/èåææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:293
+#: ../src/disks/gduatasmartdialog.c:291
 msgid "Number of cycles into landing zone position"
 msgstr "çééååæåäççææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:301
+#: ../src/disks/gduatasmartdialog.c:299
 msgid "Current internal temperature of the drive"
 msgstr "ççæçåçåéæå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:308
+#: ../src/disks/gduatasmartdialog.c:306
 msgid "Hardware ECC Recovered"
 msgstr "çä ECC åå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:309
+#: ../src/disks/gduatasmartdialog.c:307
 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
+#: ../src/disks/gduatasmartdialog.c:314
 msgid "Reallocation Count"
 msgstr "éæåéææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:317
+#: ../src/disks/gduatasmartdialog.c:315
 msgid ""
 "Number of remapping operations. The raw value of this attribute shows the "
 "total number of (successful and unsuccessful) attempts to transfer data from "
@@ -959,11 +1229,11 @@ msgstr "éææåæäçææãéååæçååæåéçåèå
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:327
+#: ../src/disks/gduatasmartdialog.c:325
 msgid "Current Pending Sector Count"
 msgstr "çåæççåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:328
+#: ../src/disks/gduatasmartdialog.c:326
 msgid ""
 "Number of sectors waiting to be remapped. If the sector waiting to be "
 "remapped is subsequently written or read successfully, this value is "
@@ -974,11 +1244,11 @@ msgstr "çåéææåççåæéãåæçåéææåççåé
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:339
+#: ../src/disks/gduatasmartdialog.c:337
 msgid "Uncorrectable Sector Count"
 msgstr "çæäæçåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:340
+#: ../src/disks/gduatasmartdialog.c:338
 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 "
@@ -988,22 +1258,22 @@ msgstr "åèå/ååçåæçæäæçéèçæãéååæç
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:349
+#: ../src/disks/gduatasmartdialog.c:347
 msgid "UDMA CRC Error Rate"
 msgstr "UDMA CRC éèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:350
+#: ../src/disks/gduatasmartdialog.c:348
 msgid "Number of CRC errors during UDMA mode"
 msgstr "å UDMA æåäç CRC éèæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:357
+#: ../src/disks/gduatasmartdialog.c:355
 msgid "Write Error Rate"
 msgstr "ååéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:358
+#: ../src/disks/gduatasmartdialog.c:356
 msgid ""
 "Number of errors while writing to disk (or) multi-zone error rate (or) "
 "flying-height"
@@ -1012,90 +1282,90 @@ msgstr "ååçç(æ)åéååéé(æ)éèéåçéèæ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:365
+#: ../src/disks/gduatasmartdialog.c:363
 msgid "Soft Read Error Rate"
 msgstr "èäèåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:366
+#: ../src/disks/gduatasmartdialog.c:364
 msgid "Number of off-track errors"
 msgstr "èèéèçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:373
+#: ../src/disks/gduatasmartdialog.c:371
 msgid "Data Address Mark Errors"
 msgstr "èæäåæèéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:374
+#: ../src/disks/gduatasmartdialog.c:372
 msgid "Number of Data Address Mark (DAM) errors (or) vendor-specific"
 msgstr "èæäåæè(DAM)(æ)ååæåçéèæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:381
+#: ../src/disks/gduatasmartdialog.c:379
 msgid "Run Out Cancel"
 msgstr "åççåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:382
+#: ../src/disks/gduatasmartdialog.c:380
 msgid "Number of ECC errors"
 msgstr "ECC éèçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:389
+#: ../src/disks/gduatasmartdialog.c:387
 msgid "Soft ECC correction"
 msgstr "èä ECC äæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:390
+#: ../src/disks/gduatasmartdialog.c:388
 msgid "Number of errors corrected by software ECC"
 msgstr "èä ECC äæçéèæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:397
+#: ../src/disks/gduatasmartdialog.c:395
 msgid "Thermal Asperity Rate"
 msgstr "æåéééç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:398
+#: ../src/disks/gduatasmartdialog.c:396
 msgid "Number of Thermal Asperity Rate errors"
 msgstr "æåéééçéèçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:405
+#: ../src/disks/gduatasmartdialog.c:403
 msgid "Flying Height"
 msgstr "éèéå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:406
+#: ../src/disks/gduatasmartdialog.c:404
 msgid "Height of heads above the disk surface"
 msgstr "çéèéççèéçéå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:413
+#: ../src/disks/gduatasmartdialog.c:411
 #, fuzzy
 msgid "Spin High Current"
 msgstr "èåçåççååç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:414
+#: ../src/disks/gduatasmartdialog.c:412
 msgid "Amount of high current used to spin up the drive"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:421
+#: ../src/disks/gduatasmartdialog.c:419
 #, fuzzy
 msgid "Spin Buzz"
 msgstr "åèæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:422
+#: ../src/disks/gduatasmartdialog.c:420
 #, fuzzy
 msgid "Number of buzz routines to spin up the drive"
 msgstr "éæåèååäèééçæéã"
@@ -1103,28 +1373,28 @@ msgstr "éæåèååäèééçæéã"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:429
+#: ../src/disks/gduatasmartdialog.c:427
 msgid "Offline Seek Performance"
 msgstr "éçæåæè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:430
+#: ../src/disks/gduatasmartdialog.c:428
 msgid "Drive's seek performance during offline operations"
 msgstr "åéçæääçççææåæè"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:437
+#: ../src/disks/gduatasmartdialog.c:435
 msgid "Disk Shift"
 msgstr "çççä"
 
-#: ../src/palimpsest/gduatasmartdialog.c:438
+#: ../src/disks/gduatasmartdialog.c:436
 msgid ""
 "Shift of disk is possible as a result of strong shock loading in the store, "
 "as a result of falling (or) temperature"
 msgstr "ççççäåèæåçåèåæéååçææïçææè(æ)æåçåçéæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:447
+#: ../src/disks/gduatasmartdialog.c:445
 msgid ""
 "Number of errors as a result of impact loads as detected by a shock sensor"
 msgstr "çææåæååæåçææèåæççéèçææ"
@@ -1132,22 +1402,22 @@ msgstr "çææåæååæåçææèåæççéèçææ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:454
+#: ../src/disks/gduatasmartdialog.c:452
 msgid "Loaded Hours"
 msgstr "èåçåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:455
+#: ../src/disks/gduatasmartdialog.c:453
 msgid "Number of hours in general operational state"
 msgstr "äèåæäçæçåææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:462
+#: ../src/disks/gduatasmartdialog.c:460
 msgid "Load/Unload Retry Count"
 msgstr "èå/èåéèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:463
+#: ../src/disks/gduatasmartdialog.c:461
 msgid ""
 "Loading on drive caused by numerous recurrences of operations, like reading, "
 "recording, positioning of heads, etc"
@@ -1156,67 +1426,67 @@ msgstr "çæäçåçåçéæçççèåïåæèåãèéã
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:471
+#: ../src/disks/gduatasmartdialog.c:469
 msgid "Load Friction"
 msgstr "èèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:472
+#: ../src/disks/gduatasmartdialog.c:470
 msgid "Load on drive caused by friction in mechanical parts of the store"
 msgstr "ååèçææéåææéæççæäçéå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:480
+#: ../src/disks/gduatasmartdialog.c:478
 msgid "Total number of load cycles"
 msgstr "èèåçæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:487
+#: ../src/disks/gduatasmartdialog.c:485
 msgid "Load-in Time"
 msgstr "çéååæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:488
+#: ../src/disks/gduatasmartdialog.c:486
 msgid "General time for loading in a drive"
 msgstr "èåçççäèæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:495
+#: ../src/disks/gduatasmartdialog.c:493
 msgid "Torque Amplification Count"
 msgstr "æèååçæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:496
+#: ../src/disks/gduatasmartdialog.c:494
 msgid "Quantity efforts of the rotating moment of a drive"
 msgstr ""
 
-#: ../src/palimpsest/gduatasmartdialog.c:504
+#: ../src/disks/gduatasmartdialog.c:502
 msgid "Number of power-off retract events"
 msgstr "éæäææçæåæçéçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:511
+#: ../src/disks/gduatasmartdialog.c:509
 msgid "GMR Head Amplitude"
 msgstr "GMR çéæå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:512
+#: ../src/disks/gduatasmartdialog.c:510
 msgid "Amplitude of heads trembling (GMR-head) in running mode"
 msgstr "ååèæåäçéæåïGMR-çéïçæå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:520
+#: ../src/disks/gduatasmartdialog.c:518
 msgid "Temperature of the drive"
 msgstr "éåççæçæå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:527
+#: ../src/disks/gduatasmartdialog.c:525
 msgid "Endurance Remaining"
 msgstr "åéèäå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:528
+#: ../src/disks/gduatasmartdialog.c:526
 msgid ""
 "Number of physical erase cycles completed on the drive as a percentage of "
 "the maximum physical erase cycles the drive supports"
@@ -1225,22 +1495,22 @@ msgstr "äçåæèçççæåéæåççæéåçèçååå
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:544
+#: ../src/disks/gduatasmartdialog.c:542
 msgid "Uncorrectable ECC Count"
 msgstr "çæææç ECC ææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:545
+#: ../src/disks/gduatasmartdialog.c:543
 msgid "Number of uncorrectable ECC errors"
 msgstr "çæææç ECC éèçæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:552
+#: ../src/disks/gduatasmartdialog.c:550
 msgid "Good Block Rate"
 msgstr "èåååç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:553
+#: ../src/disks/gduatasmartdialog.c:551
 msgid ""
 "Number of available reserved blocks as a percentage of the total number of "
 "reserved blocks"
@@ -1249,88 +1519,45 @@ msgstr "åççäçååæäåéäçååæççåæ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:561
+#: ../src/disks/gduatasmartdialog.c:559
 msgid "Head Flying Hours"
 msgstr "çééèåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:562
+#: ../src/disks/gduatasmartdialog.c:560
 msgid "Time while head is positioning"
 msgstr "çéåäçæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:569
+#: ../src/disks/gduatasmartdialog.c:567
 msgid "Read Error Retry Rate"
 msgstr "èåéèéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:570
+#: ../src/disks/gduatasmartdialog.c:568
 msgid "Number of errors while reading from a disk"
 msgstr "åççèåæççéèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:630
-#: ../src/palimpsest/gduatasmartdialog.c:820
+#: ../src/disks/gduatasmartdialog.c:628
 #, c-format
 msgid "No description for attribute %d"
 msgstr "ææåæ %d çæè"
 
 #. Translators: Shown in the treeview for a failing attribute
-#: ../src/palimpsest/gduatasmartdialog.c:681
+#: ../src/disks/gduatasmartdialog.c:679
 msgid "FAILING"
 msgstr "åæ"
 
 #. Translators: Shown in the treeview for an attribute that failed in the past
-#: ../src/palimpsest/gduatasmartdialog.c:690
+#: ../src/disks/gduatasmartdialog.c:688
 msgid "Failed in the past"
 msgstr "éåçéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:694
+#: ../src/disks/gduatasmartdialog.c:692
 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 å"
-
-#. 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 å"
-
-#. 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 åæ"
-
-#. 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 åé"
-
-#. 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 çé"
-
-#. 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 åç"
-
-#: ../src/palimpsest/gduatasmartdialog.c:764
+#: ../src/disks/gduatasmartdialog.c:719
 #, c-format
 msgid "%d sector"
 msgid_plural "%d sectors"
@@ -1343,8 +1570,7 @@ msgstr[0] "%d çå"
 #. * The first %f is the temperature in degrees Celcius and
 #. * the second %f is the temperature in degrees Fahrenheit.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:776
-#: ../src/palimpsest/gduatasmartdialog.c:1058
+#: ../src/disks/gduatasmartdialog.c:731 ../src/disks/gduatasmartdialog.c:943
 #, c-format
 msgid "%.0f C / %.0f F"
 msgstr "%.0f C / %.0f F"
@@ -1352,57 +1578,25 @@ 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
+#: ../src/disks/gduatasmartdialog.c:742
 msgid "N/A"
 msgstr "N/A"
 
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Pre-Fail)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:831
-msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
-msgstr "åçåææ 24 åæåååççççææçåå (éåççéè)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Old-Age)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:838
-msgid ""
-"Failure is a sign the disk exceeded its intended design life period (Old-Age)"
-msgstr "åçåææççæåèéåèèçäçåé (èå)"
-
-#. 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 "ææèæéææé (äç)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Not Online)" in English
+#. Translators: The first %s is the pretty value (such as '300
+#. * sectors' or '2.5 years' or '53Â C / 127Â F').
+#. *
+#. * The three %d are the normalized, threshold and worst values -
+#. * these are all decimal numbers.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:853
-msgid "Only during off-line activities (Not Online)"
-msgstr "ååéçæåæéïéäççæï"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:861
-msgid "Name"
-msgstr "åç"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:867
-msgid "Description"
-msgstr "èæ"
-
-#: ../src/palimpsest/gduatasmartdialog.c:908
+#: ../src/disks/gduatasmartdialog.c:788
 #, c-format
-msgid "%d <span size=\"small\">(Worst:%d, Threshold: %d)</span>"
-msgstr "%d <span size=\"small\">(æåï%dïçéï%d)</span>"
+msgid ""
+"%s <span size=\"small\">(Normalized: %d, Threshold: %d, Worst: %d)</span>"
+msgstr "%s <span size=\"small\">(äèåï%dïçéï%dïæåï%d)</span>"
 
 #. Translators: Please keep "(Pre-Fail)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:918
+#: ../src/disks/gduatasmartdialog.c:798
 msgid ""
 "Failure is a sign the disk will fail within 24 hours <span size=\"small\">"
 "(Pre-Fail)</span>"
@@ -1410,7 +1604,7 @@ msgstr "åçåææ 24 åæåååççççææçåå <span size
 
 #. Translators: Please keep "(Old-Age)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:924
+#: ../src/disks/gduatasmartdialog.c:804
 msgid ""
 "Failure is a sign the disk exceeded its intended design life period <span "
 "size=\"small\">(Old-Age)</span>"
@@ -1418,191 +1612,350 @@ msgstr "åçåææççæåèéåèèçäçåé<span size=\"sm
 
 #. 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\">(äç)</span>"
+#: ../src/disks/gduatasmartdialog.c:811
+msgid ""
+"Updated every time data is collected <span size=\"small\">(Online)</span>"
+msgstr "æææéèæ <span size=\"small\">(Online)</span> æææ"
 
 #. Translators: Please keep "(Not Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:937
+#: ../src/disks/gduatasmartdialog.c:817
 msgid ""
-"Only during off-line activities <span size=\"small\">(Not Online)</span>"
-msgstr "ååéçæåæé <span size=\"small\">(éäççæ)</span>"
+"Updated only during off-line activities <span size=\"small\">(Not Online)</"
+"span>"
+msgstr "ååéçæåæé <span size=\"small\">(Not Online)</span>"
 
-#: ../src/palimpsest/gduatasmartdialog.c:964
+#: ../src/disks/gduatasmartdialog.c:848
 msgctxt "smart-self-test-result"
 msgid "Last self-test completed successfully"
 msgstr "äææååæçèææè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:968
+#: ../src/disks/gduatasmartdialog.c:852
 msgctxt "smart-self-test-result"
 msgid "Last self-test was aborted"
 msgstr "äæçèææèåäæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:972
+#: ../src/disks/gduatasmartdialog.c:856
 msgctxt "smart-self-test-result"
 msgid "Last self-test was interrupted"
 msgstr "äæçèææèåäæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:976
+#: ../src/disks/gduatasmartdialog.c:860
 msgctxt "smart-self-test-result"
 msgid "Last self-test did not complete"
 msgstr "äæçèææèæåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:980
+#: ../src/disks/gduatasmartdialog.c:864
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed"
 msgstr "äæèææèåæ"
 
 #. Translators: shown when the last self-test failed and the problem is with the electrical subsystem
-#: ../src/palimpsest/gduatasmartdialog.c:985
+#: ../src/disks/gduatasmartdialog.c:869
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (electrical)"
 msgstr "äæçèææèåæ (éåæé)"
 
 #. Translators: shown when the last self-test failed and the problem is with the servo subsystem - see http://en.wikipedia.org/wiki/Servomechanism
-#: ../src/palimpsest/gduatasmartdialog.c:990
+#: ../src/disks/gduatasmartdialog.c:874
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (servo)"
-msgstr ""
+msgstr "äæèææèåæ (servo)"
 
 #. Translators: shown when the last self-test failed and the problem is with the reading subsystem -
-#: ../src/palimpsest/gduatasmartdialog.c:995
+#: ../src/disks/gduatasmartdialog.c:879
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (read)"
-msgstr ""
+msgstr "äæèææèåæ (read)"
 
 #. Translators: shown when the last self-test failed and the disk is suspected of having handling damage (e.g. physical damage to the hard disk)
-#: ../src/palimpsest/gduatasmartdialog.c:1000
+#: ../src/disks/gduatasmartdialog.c:884
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (handling)"
 msgstr "äæçèææèåæ (èç)"
 
 #. Translators: shown when a self-test is in progress. The first %d is the percentage of the test remaining.
-#: ../src/palimpsest/gduatasmartdialog.c:1005
+#: ../src/disks/gduatasmartdialog.c:889
 #, c-format
 msgctxt "smart-self-test-result"
 msgid "Self-test in progress â %d%% remaining"
 msgstr "èææèéèä - åä %d%%"
 
 #. Translators: Shown when a self-test is not unknown. The %s is the result-code from the API code.
-#: ../src/palimpsest/gduatasmartdialog.c:1012
+#: ../src/disks/gduatasmartdialog.c:896
 #, c-format
 msgctxt "smart-self-test-result"
 msgid "Unknown (%s)"
 msgstr "äæ (%s)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1034
+#: ../src/disks/gduatasmartdialog.c:919
 #, c-format
 msgid "%s ago"
 msgstr "%så"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1091
+#: ../src/disks/gduatasmartdialog.c:977
 msgid "SMART is not supported"
 msgstr "äææ SMART"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1097
+#: ../src/disks/gduatasmartdialog.c:983
 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:995
+msgid "Self-test in progress"
+msgstr "æåéèèææè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1123
-#: ../src/palimpsest/gduatasmartdialog.c:1132
+#: ../src/disks/gduatasmartdialog.c:1008 ../src/disks/gduatasmartdialog.c:1017
 msgid "DISK IS LIKELY TO FAIL SOON"
 msgstr "ççæääåååæåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1155
+#: ../src/disks/gduatasmartdialog.c:1040
 msgid "SELF-TEST FAILED"
 msgstr "èææèåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1164
+#: ../src/disks/gduatasmartdialog.c:1049
 #, c-format
 msgid "Disk is OK, one failing attribute is failing"
 msgid_plural "Disk is OK, %d attributes are failing"
 msgstr[0] "ççææåï%d åææåé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1175
+#: ../src/disks/gduatasmartdialog.c:1060
 #, c-format
 msgid "Disk is OK, one bad sector"
 msgid_plural "Disk is OK, %d bad sectors"
 msgstr[0] "ççæèåï%d åæåççå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1186
+#: ../src/disks/gduatasmartdialog.c:1071
 #, 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 ååæéåæåé"
 
+#. Otherwise, it's all honky dory
+#: ../src/disks/gduatasmartdialog.c:1080
+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/palimpsest/gduatasmartdialog.c:1209
+#: ../src/disks/gduatasmartdialog.c:1094
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1364
+#: ../src/disks/gduatasmartdialog.c:1249
 msgid "Threshold exceeded"
 msgstr "èéçé"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1369
+#: ../src/disks/gduatasmartdialog.c:1254
 msgid "Threshold not exceeded"
 msgstr "åæèéçé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1428
+#: ../src/disks/gduatasmartdialog.c:1313
 msgid "Error refreshing SMART data"
 msgstr "ææ SMART èææççéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1460
+#: ../src/disks/gduatasmartdialog.c:1345
 msgid "Error aborting SMART self-test"
 msgstr "äæ SMART èææèæççéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1479
+#: ../src/disks/gduatasmartdialog.c:1364
 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
+#: ../src/disks/gduatasmartdialog.c:1479
 msgid "ID"
 msgstr "ID"
 
 #. Translators: This string is used as the column title in the treeview for the attribute name and description
-#: ../src/palimpsest/gduatasmartdialog.c:1606
+#: ../src/disks/gduatasmartdialog.c:1491
 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:341
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%d MB/s"
+msgstr "%d MB/s"
+
+#. Translators: This is used in the benchmark graph - %g is number of milliseconds
+#: ../src/disks/gdubenchmarkdialog.c:346
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%3g ms"
+msgstr "%3g ms"
+
+#. Translators: %s is the formatted size, e.g. "42 MB" and the trailing "/s" means per second
+#: ../src/disks/gdubenchmarkdialog.c:654
+#, c-format
+msgctxt "benchmark-transfer-rate"
+msgid "%s/s"
+msgstr "%s/s"
+
+#: ../src/disks/gdubenchmarkdialog.c:669 ../src/disks/gdubenchmarkdialog.c:968
+#, c-format
+msgid "%d sample"
+msgid_plural "%d samples"
+msgstr[0] "%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:710
+#, c-format
+msgctxt "benchmark-updated"
+msgid "%s (%s ago)"
+msgstr "%s (%s å)"
+
+#: ../src/disks/gdubenchmarkdialog.c:722
+msgctxt "benchmark-updated"
+msgid "No benchmark data available"
+msgstr "ææåççæèèæèæ"
+
+#: ../src/disks/gdubenchmarkdialog.c:727
+msgctxt "benchmark-updated"
+msgid "Opening Device..."
+msgstr "éåèçâ"
+
+#: ../src/disks/gdubenchmarkdialog.c:731
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring transfer rate (%2.1f%% complete)..."
+msgstr "æéåèç (ååæ %2.1f%%)â"
+
+#: ../src/disks/gdubenchmarkdialog.c:738
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring access time (%2.1f%% complete)..."
+msgstr "æéååæé (ååæ %2.1f%%)â"
+
+#: ../src/disks/gdubenchmarkdialog.c:854
+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:890
+#, 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:900
+#, 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:966
+#, c-format
+msgctxt "benchmark-access-time"
+msgid "%.2f msec"
+msgstr "%.2f æç"
+
+#: ../src/disks/gdubenchmarkdialog.c:1278
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting size of device: %m"
+msgstr "ååèçååæççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1288
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting page size: %m\n"
+msgstr "åååéååæççéèï%m\n"
+
+#: ../src/disks/gdubenchmarkdialog.c:1321
+#: ../src/disks/gdubenchmarkdialog.c:1340
+#: ../src/disks/gdubenchmarkdialog.c:1376
+#: ../src/disks/gdubenchmarkdialog.c:1395
+#, c-format
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld"
+msgstr "æååçé %lld æççéè"
+
+#: ../src/disks/gdubenchmarkdialog.c:1330
+#: ../src/disks/gdubenchmarkdialog.c:1385
+#, c-format
+msgctxt "benchmarking"
+msgid "Error pre-reading %lld bytes from offset %lld"
+msgstr "ååçé %2$lld éè %1$lld äåçæççéè"
+
+#: ../src/disks/gdubenchmarkdialog.c:1351
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %d MB from offset %lld"
+msgstr "ååçé %2$lld èå %1$d MB æççéè"
+
+#: ../src/disks/gdubenchmarkdialog.c:1406
+#, c-format
+msgctxt "benchmarking"
+msgid "Error writing %lld bytes at offset %lld: %m"
+msgstr "åå %lld äåçæèå %lld æççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1416
+#, c-format
+msgctxt "benchmarking"
+msgid "Expected to write %lld bytes, only wrote %lld: %m"
+msgstr "éæåå %lld äåçïååå %lldï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1426
+#, c-format
+msgctxt "benchmarking"
+msgid "Error syncing (at offset %lld): %m"
+msgstr "åæ (æåçé %lld) æççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1466
+#, c-format
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld: %m"
+msgstr "æååçé %lld æççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1478
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %lld bytes from offset %lld"
+msgstr "ååçé %2$lld èå %1$lld äåçæççéè"
+
+#: ../src/disks/gduchangepassphrasedialog.c:171
 msgid "Error updating /etc/crypttab"
 msgstr "åææ /etc/crypttab æççéè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:190
+#: ../src/disks/gduchangepassphrasedialog.c:190
 msgid "Error changing passphrase"
 msgstr "æèåèæççéè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:277
-#: ../src/palimpsest/gducrypttabdialog.c:424
+#: ../src/disks/gduchangepassphrasedialog.c:277
+#: ../src/disks/gducrypttabdialog.c:422
 msgid "Error retrieving configuration data"
 msgstr "ååçæèææççéè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:303
+#: ../src/disks/gduchangepassphrasedialog.c:303
 msgid "/etc/crypttab configuration data is malformed"
 msgstr "/etc/crypttab çæèæçæåäè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:336
+#: ../src/disks/gduchangepassphrasedialog.c:336
 msgid ""
 "Changing the passphrase for this device, will also update the passphrase "
 "referenced by the <i>/etc/crypttab</i> file"
 msgstr "æèéåèççåèïååæææ <i>/etc/crypttab</i> ææäåççåè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:355
-#: ../src/palimpsest/gducreatefilesystemwidget.c:503
+#: ../src/disks/gduchangepassphrasedialog.c:355
+#: ../src/disks/gducreatefilesystemwidget.c:550
 msgid "The strength of the passphrase"
 msgstr "åèçåå"
 
@@ -1610,169 +1963,186 @@ msgstr "åèçåå"
 #. *              The first %s is a name for the disk (e.g. 'sdb').
 #. *              The second %s is today's date and time, e.g. "March 2, 1976 6:25AM".
 #.
-#: ../src/palimpsest/gducreatediskimagedialog.c:196
+#: ../src/disks/gducreatediskimagedialog.c:196
 #, c-format
 msgid "Disk Image of %s (%s).img"
 msgstr "ççæåæ %s (%s).img"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:233
-#: ../src/palimpsest/gdurestorediskimagedialog.c:274
+#: ../src/disks/gducreatediskimagedialog.c:233
+#: ../src/disks/gdurestorediskimagedialog.c:274
 msgid "Error writing to backup image"
 msgstr "åååäæåææççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:313
-#: ../src/palimpsest/gdurestorediskimagedialog.c:353
-#, fuzzy
+#: ../src/disks/gducreatediskimagedialog.c:314
+#: ../src/disks/gdurestorediskimagedialog.c:354
 msgid "Error reading from offset %"
-msgstr "åææèåæççéèï%s"
+msgstr "ååçé % èåæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:381
-#: ../src/palimpsest/gdurestorediskimagedialog.c:541
+#: ../src/disks/gducreatediskimagedialog.c:382
+#: ../src/disks/gdurestorediskimagedialog.c:542
 msgid "Error opening device"
 msgstr "éåèçæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:396
-#: ../src/palimpsest/gdurestorediskimagedialog.c:557
+#: ../src/disks/gducreatediskimagedialog.c:397
+#: ../src/disks/gdurestorediskimagedialog.c:558
 msgid "Error determining size of device"
 msgstr "çåèçåéæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:446
+#: ../src/disks/gducreatediskimagedialog.c:447
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "åçã%sãçææåååãæåèåäåï"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:449
+#: ../src/disks/gducreatediskimagedialog.c:450
 #, 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:454
 msgid "_Replace"
 msgstr "åä(_R)"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:495
+#: ../src/disks/gducreatediskimagedialog.c:496
 msgid "Error opening file for writing"
 msgstr "éåææäååæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:564
+#: ../src/disks/gducreatediskimagedialog.c:565
 #, c-format
 msgid "Copying data from device <i>%s</i>..."
 msgstr "æååèç <i>%s</i> äèèèæâ"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:388
-#: ../src/palimpsest/gduformatdiskdialog.c:130
+#: ../src/disks/gducreatefilesystemwidget.c:392
+#: ../src/disks/gduformatdiskdialog.c:268
 msgid "Compatible with all systems and devices"
 msgstr "ååæææçççèèç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:389
+#: ../src/disks/gducreatefilesystemwidget.c:393
 msgid "FAT"
 msgstr "FAT"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:394
+#: ../src/disks/gducreatefilesystemwidget.c:398
 msgid "Compatible with most systems"
 msgstr "ååæåæçç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:395
+#: ../src/disks/gducreatefilesystemwidget.c:399
 msgid "NTFS"
 msgstr "NTFS"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:400
+#: ../src/disks/gducreatefilesystemwidget.c:404
 msgid "Compatible with Linux systems"
 msgstr "ååæ Linux çç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:401
+#: ../src/disks/gducreatefilesystemwidget.c:405
 msgid "Ext4"
 msgstr "Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:406
+#: ../src/disks/gducreatefilesystemwidget.c:410
 msgid "Encrypted, compatible with Linux systems"
 msgstr "åååïååæ Linux çç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:407
+#: ../src/disks/gducreatefilesystemwidget.c:411
 msgid "LUKS + Ext4"
 msgstr "LUKS + Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:412
+#: ../src/disks/gducreatefilesystemwidget.c:416
 msgid "Custom"
 msgstr "èé"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:413
+#: ../src/disks/gducreatefilesystemwidget.c:417
 msgid "Enter filesystem type"
 msgstr "èåææççéå"
 
 #. Translators: this is the default name for the filesystem
-#: ../src/palimpsest/gducreatefilesystemwidget.c:456
+#: ../src/disks/gducreatefilesystemwidget.c:460
 msgid "New Volume"
 msgstr "æååå"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:215
+#: ../src/disks/gducreatefilesystemwidget.c:499
+#: ../src/disks/gduformatdiskdialog.c:165
+msgid "Don't overwrite existing data"
+msgstr "äèèååååçèæ"
+
+#: ../src/disks/gducreatefilesystemwidget.c:500
+#: ../src/disks/gduformatdiskdialog.c:166
+msgid "Quick"
+msgstr "åé"
+
+#: ../src/disks/gducreatefilesystemwidget.c:507
+#: ../src/disks/gduformatdiskdialog.c:176
+msgid "Overwrite existing data with zeroes"
+msgstr "äéèåæåçèæ"
+
+#: ../src/disks/gducreatefilesystemwidget.c:508
+#: ../src/disks/gduformatdiskdialog.c:177
+msgid "Slow"
+msgstr "æé"
+
+#: ../src/disks/gducreatepartitiondialog.c:215
 msgid "Error formatting partition"
 msgstr "æåååååæççéè"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:242
+#: ../src/disks/gducreatepartitiondialog.c:243
 msgid "Error creating partition"
 msgstr "åçåååæççéè"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:326
+#: ../src/disks/gducreatepartitiondialog.c:331
 msgid "Extended partition"
 msgstr "åäååå"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:327
+#: ../src/disks/gducreatepartitiondialog.c:332
 msgid "For logical partitions"
 msgstr "çæéèååå"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:340
+#: ../src/disks/gducreatepartitiondialog.c:345
 msgid ""
 "Cannot create a new partition. There are already four primary partitions."
 msgstr "äèåçæçåååãåçæååäèåååã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:344
+#: ../src/disks/gducreatepartitiondialog.c:349
 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:122 ../src/disks/gducrypttabdialog.c:142
 msgid "Will be created"
 msgstr "åæåç"
 
-#: ../src/palimpsest/gducrypttabdialog.c:124
-#: ../src/palimpsest/gducrypttabdialog.c:149
+#: ../src/disks/gducrypttabdialog.c:124 ../src/disks/gducrypttabdialog.c:149
 msgid "None"
 msgstr "ææ"
 
-#: ../src/palimpsest/gducrypttabdialog.c:151
+#: ../src/disks/gducrypttabdialog.c:151
 msgid "Will be deleted"
 msgstr "æèåé"
 
-#: ../src/palimpsest/gducrypttabdialog.c:278
+#: ../src/disks/gducrypttabdialog.c:277
 msgid "Error removing /etc/crypttab entry"
 msgstr "çé /etc/crypttab éçæççéè"
 
-#: ../src/palimpsest/gducrypttabdialog.c:363
+#: ../src/disks/gducrypttabdialog.c:361
 msgid "Error adding /etc/crypttab entry"
 msgstr "åå /etc/crypttab éçæççéè"
 
-#: ../src/palimpsest/gducrypttabdialog.c:386
+#: ../src/disks/gducrypttabdialog.c:384
 msgid "Error updating /etc/crypttab entry"
 msgstr "åææ /etc/crypttab éçæççéè"
 
-#: ../src/palimpsest/gducrypttabdialog.c:509
+#: ../src/disks/gducrypttabdialog.c:507
 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>"
 msgstr "åæå <i>/etc/crypttab</i> ææåççåèææèãèæèççæäçåèïäç <i>æèåèâ</i>"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:410
+#: ../src/disks/gdudevicetreemodel.c:498
 msgid "Disk Drives"
 msgstr "ççæ"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:820
+#: ../src/disks/gdudevicetreemodel.c:907
 msgid "Other Devices"
 msgstr "åäèç"
 
 #. Translators: This is for a /dev/loop device - %s is the size of the device e.g. "230 MB".
-#: ../src/palimpsest/gdudevicetreemodel.c:925
+#: ../src/disks/gdudevicetreemodel.c:1012
 #, c-format
 msgid "%s Loop Device"
 msgstr "%s Loop èç"
@@ -1780,216 +2150,448 @@ msgstr "%s Loop èç"
 #. Translators: This is for a block device which we failed to categorize  - %s is
 #. * the size of the device e.g. "230 MB".
 #.
-#: ../src/palimpsest/gdudevicetreemodel.c:946
+#: ../src/disks/gdudevicetreemodel.c:1033
 #, c-format
 msgid "%s Block Device"
 msgstr "%s ååèç"
 
-#: ../src/palimpsest/gdufilesystemdialog.c:74
+#: ../src/disks/gdudisksettingsdialog.c:278
+msgctxt "standby-value"
+msgid "Never"
+msgstr "æä"
+
+#: ../src/disks/gdudisksettingsdialog.c:297
+msgctxt "standby-value"
+msgid "Vendor-defined"
+msgstr "åååç"
+
+#: ../src/disks/gdudisksettingsdialog.c:301
+msgctxt "standby-value"
+msgid "Reserved"
+msgstr "åäç"
+
+#: ../src/disks/gdudisksettingsdialog.c:322
+msgctxt "apm-level"
+msgid "255 (Disabled)"
+msgstr "255 (ååç)"
+
+#: ../src/disks/gdudisksettingsdialog.c:326
+#, fuzzy, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down permitted)"
+msgstr "åäæè"
+
+#: ../src/disks/gdudisksettingsdialog.c:330
+#, fuzzy, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down not permitted)"
+msgstr "äåèçååç"
+
+#: ../src/disks/gdudisksettingsdialog.c:345
+msgctxt "aam-level"
+msgid "0 (Disabled)"
+msgstr "0 (ååç)"
+
+#: ../src/disks/gdudisksettingsdialog.c:374
+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:404
+msgid "Never"
+msgstr "æä"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:406
+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:408
+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:410
+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:412
+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:416
+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:418
+msgid "â Spindown"
+msgstr ""
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:420
+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:424
+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:426
+msgid "Loud (Fast)"
+msgstr "åé (åé)"
+
+#: ../src/disks/gdufilesystemdialog.c:74
 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:119
+#, 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:130
+#, c-format
+msgid "Approximately %s"
+msgstr "åç %s"
+
+#: ../src/disks/gduformatdiskdialog.c:209
+msgid "ATA Secure Erase"
+msgstr "ATA ååæé"
+
+#: ../src/disks/gduformatdiskdialog.c:224
+msgid "ATA Enhanced Secure Erase"
+msgstr "ATA ååååæé"
+
+#: ../src/disks/gduformatdiskdialog.c:269
 msgid "MBR / DOS"
 msgstr "MBR / DOS"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:138
+#: ../src/disks/gduformatdiskdialog.c:279
 msgid "Compatible with modern systems and hard disks > 2TB"
 msgstr "ååæçäçççèçç > 2TB"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:139
+#: ../src/disks/gduformatdiskdialog.c:280
 msgid "GPT"
 msgstr "GPT"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:151
+#: ../src/disks/gduformatdiskdialog.c:297
 msgid "No partitioning"
 msgstr "ææååå"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:152
+#: ../src/disks/gduformatdiskdialog.c:298
 msgid "Empty"
 msgstr "çç"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:186
+#: ../src/disks/gduformatdiskdialog.c:342
 msgid "Error formatting disk"
 msgstr "æååççæççéè"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:231
+#: ../src/disks/gduformatdiskdialog.c:399
 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:403
+msgid ""
+"All data on the disk will be lost but may still be recoverable by data "
+"recovery services"
+msgstr "ççäææçèæåææåïäæåèäçåääçèæååæåäéå"
+
+#: ../src/disks/gduformatdiskdialog.c:405
+#: ../src/disks/gduformatvolumedialog.c:167
+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:410
+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:418
+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 Secure Erase</a> çæçääçèääèåéé"
+
+#: ../src/disks/gduformatdiskdialog.c:425
+#: ../src/disks/gduformatvolumedialog.c:178
 msgid "_Format"
 msgstr "æåå(_F)"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:100
+#: ../src/disks/gduformatvolumedialog.c:100
 msgid "Error formatting volume"
 msgstr "æåååååæççéè"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:157
+#: ../src/disks/gduformatvolumedialog.c:161
 msgid "Are you sure you want to format the volume?"
 msgstr "çåèæååæåååï"
 
-#: ../src/palimpsest/gdufstabdialog.c:166
+#. Translators: warning used for quick format of the volume
+#: ../src/disks/gduformatvolumedialog.c:165
+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:172
+msgid ""
+"All data on the volume will be overwritten and will likely not be "
+"recoverable by data recovery services"
+msgstr "åååäææçèæåæèèåïèäåèçæäçèæååæåäéå"
+
+#: ../src/disks/gdufstabdialog.c:166
 #, 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:169
 msgid "Matches the whole disk of the device with the given vital product data"
 msgstr "äæåççéçåèææåèççæåçç"
 
-#: ../src/palimpsest/gdufstabdialog.c:174
+#: ../src/disks/gdufstabdialog.c:174
 #, 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:177
 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:181
 msgid "Matches any device with the given label"
 msgstr "äæåçæçæåääèç"
 
-#: ../src/palimpsest/gdufstabdialog.c:185
+#: ../src/disks/gdufstabdialog.c:185
 msgid "Matches the device with the given UUID"
 msgstr "äæåç UUID æåääèç"
 
-#: ../src/palimpsest/gdufstabdialog.c:189
+#: ../src/disks/gdufstabdialog.c:189
 msgid "Matches the given device"
 msgstr "çåæåçèç"
 
-#: ../src/palimpsest/gdufstabdialog.c:473
+#: ../src/disks/gdufstabdialog.c:473
 msgid "The system may not work correctly if this entry is modified or removed."
 msgstr "åæéåéçèäææçéççåèçææåéäã"
 
-#: ../src/palimpsest/gdufstabdialog.c:532
+#: ../src/disks/gdufstabdialog.c:532
 msgid "Error removing old /etc/fstab entry"
 msgstr "çéè /etc/fstab éçæççéè"
 
-#: ../src/palimpsest/gdufstabdialog.c:588
+#: ../src/disks/gdufstabdialog.c:588
 msgid "Error adding new /etc/fstab entry"
 msgstr "ååæ /etc/fstab éçæççéè"
 
-#: ../src/palimpsest/gdufstabdialog.c:612
+#: ../src/disks/gdufstabdialog.c:612
 msgid "Error updating /etc/fstab entry"
 msgstr "åææ  /etc/fstab éçæççéè"
 
-#: ../src/palimpsest/gdupartitiondialog.c:369
+#: ../src/disks/gdupartitiondialog.c:369
 msgid "Error setting partition type"
 msgstr "èååååéåæççéè"
 
-#: ../src/palimpsest/gdupartitiondialog.c:383
+#: ../src/disks/gdupartitiondialog.c:383
 msgid "Error setting partition name"
 msgstr "èåååååçæççéè"
 
-#: ../src/palimpsest/gdupartitiondialog.c:397
+#: ../src/disks/gdupartitiondialog.c:397
 msgid "Error setting partition flags"
 msgstr "èååååæææççéè"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:169
+#: ../src/disks/gdupasswordstrengthwidget.c:139
+msgctxt "Password strength"
 msgid "Weak"
-msgstr "å"
+msgstr "åå"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:170
+#: ../src/disks/gdupasswordstrengthwidget.c:140
+msgctxt "Password strength"
 msgid "Fair"
 msgstr "äè"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:171
+#: ../src/disks/gdupasswordstrengthwidget.c:141
+msgctxt "Password strength"
 msgid "Good"
 msgstr "èå"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:172
+#: ../src/disks/gdupasswordstrengthwidget.c:142
+msgctxt "Password strength"
 msgid "Strong"
-msgstr "å"
+msgstr "åå"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:167
+#: ../src/disks/gdurestorediskimagedialog.c:167
 msgid "Cannot restore image of size 0"
 msgstr "äèéåååç 0 çæåæ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:176
-#, fuzzy, c-format
-#| msgid "The selected image is %s bytes smaller than the device"
+#: ../src/disks/gdurestorediskimagedialog.c:176
+#, c-format
 msgid "The selected image is %s smaller than the device"
-msgstr "éåçæåææèçåä %s äåç"
+msgstr "éåçæåææèçåä %s"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:185
-#, fuzzy, c-format
-#| msgid "The selected image is %s bytes bigger than the device"
+#: ../src/disks/gdurestorediskimagedialog.c:185
+#, c-format
 msgid "The selected image is %s bigger than the device"
-msgstr "éåçæåææèçåä %s äåç"
+msgstr "éåçæåææèçåä %s"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:416
+#: ../src/disks/gdurestorediskimagedialog.c:417
 msgid "Error opening file for reading"
 msgstr "éåææäèåæççéè"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:430
+#: ../src/disks/gdurestorediskimagedialog.c:431
 msgid "Error determing size of file"
 msgstr "æåææçåéæççéè"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:495
+#: ../src/disks/gdurestorediskimagedialog.c:496
 msgid "Are you sure you want to write the disk image to the device?"
 msgstr "çåèåéåççæåæåååèçï"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:496
+#: ../src/disks/gdurestorediskimagedialog.c:497
 msgid "All existing data will be lost"
 msgstr "æææåçèæéææå"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:497
+#: ../src/disks/gdurestorediskimagedialog.c:498
 msgid "_Restore"
 msgstr "éå(_R)"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:500
+#: ../src/disks/gdurestorediskimagedialog.c:501
 #, c-format
 msgid "Copying data to device <i>%s</i>..."
 msgstr "èèèæåèç <i>%s</i>â"
 
-#: ../src/palimpsest/gduunlockdialog.c:50
+#: ../src/disks/gduunlockdialog.c:99
 msgid "Error unlocking encrypted device"
 msgstr "èéåååèçæççéè"
 
-#: ../src/palimpsest/gduutils.c:81
-msgid "All Files"
-msgstr "ææææ"
+#: ../src/disks/gduunlockdialog.c:154
+msgid "The encryption passphrase was retrieved from the keyring"
+msgstr "åååèåååçåååå"
 
-#: ../src/palimpsest/gduutils.c:85
-msgid "Disk Images (*.img, *.iso)"
-msgstr "ççæåæ (*.img, *.iso)"
+#. Translators: Used for number of years
+#: ../src/disks/gduutils.c:378
+#, c-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d å"
 
-#: ../src/palimpsest/gduutils.c:105
+#. Translators: Used for number of months
+#: ../src/disks/gduutils.c:385
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ç"
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d æ"
+
+#. Translators: Used for number of days
+#: ../src/disks/gduutils.c:392
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d æ"
 
-#: ../src/palimpsest/gduutils.c:112
-msgid "Less than a minute"
-msgstr "åæäåé"
+#. Translators: Used for number of hours
+#: ../src/disks/gduutils.c:399
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d æ"
 
-#: ../src/palimpsest/gduutils.c:118
+#. Translators: Used for number of minutes
+#: ../src/disks/gduutils.c:406
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d å"
 
-#: ../src/palimpsest/gduutils.c:126
+#. Translators: Used for number of seconds
+#: ../src/disks/gduutils.c:413
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d æ"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ç"
+
+#. Translators: Used for number of milli-seconds
+#: ../src/disks/gduutils.c:420
+#, c-format
+msgid "%d milli-second"
+msgid_plural "%d milli-seconds"
+msgstr[0] "%d æç"
+
+#. Translators: Used for duration greater than one year. First %s is number of years, second %s is months, third %s is days
+#: ../src/disks/gduutils.c:484
+#, 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/disks/gduutils.c:489
+#, 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/disks/gduutils.c:494
+#, 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/disks/gduutils.c:499
+#, 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/disks/gduutils.c:504
+#, c-format
+msgctxt "duration-minute-to-hour"
+msgid "%s and %s"
+msgstr "%s %s"
+
+#. Translators: Used for durations less than one minute byte greater than one second. First %s is number of seconds
+#: ../src/disks/gduutils.c:509
+#, 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/disks/gduutils.c:514
+#, c-format
+msgctxt "duration-zero-to-second"
+msgid "%s"
+msgstr "%s"
 
 #. 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
+#: ../src/disks/gduvolumegrid.c:1534
 #, c-format
 msgctxt "volume-grid"
 msgid "Partition %d: %s"
@@ -1998,86 +2600,108 @@ 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
+#: ../src/disks/gduvolumegrid.c:1541
 #, c-format
 msgctxt "volume-grid"
 msgid "Partition %d"
 msgstr "ååå %d"
 
-#: ../src/palimpsest/gduvolumegrid.c:1604
+#: ../src/disks/gduvolumegrid.c:1561
 msgid "No Media"
 msgstr "ææåé"
 
-#: ../src/palimpsest/gduvolumegrid.c:1621
+#: ../src/disks/gduvolumegrid.c:1578
 msgctxt "volume-grid"
 msgid "Free Space"
 msgstr "åççé"
 
-#: ../src/palimpsest/gduvolumegrid.c:1663
+#: ../src/disks/gduvolumegrid.c:1620
 msgctxt "volume-grid"
 msgid "Extended Partition"
 msgstr "åäååå"
 
-#: ../src/palimpsest/gduvolumegrid.c:1687
+#: ../src/disks/gduvolumegrid.c:1644
 msgctxt "volume-grid"
 msgid "Filesystem"
 msgstr "ææçç"
 
-#: ../src/palimpsest/gduvolumegrid.c:1706
+#: ../src/disks/gduvolumegrid.c:1662
 msgctxt "volume-grid"
 msgid "Swap"
 msgstr "çæçé"
 
-#: ../src/palimpsest/gduwindow.c:531
+#: ../src/disks/gduwindow.c:626
 msgid "Error deleting loop device"
 msgstr "åé loop èçæççéè"
 
-#: ../src/palimpsest/gduwindow.c:602 ../src/palimpsest/gduwindow.c:674
+#: ../src/disks/gduwindow.c:697 ../src/disks/gduwindow.c:769
 msgid "Error attaching disk image"
 msgstr "éåççæåææççéè"
 
-#: ../src/palimpsest/gduwindow.c:642
+#: ../src/disks/gduwindow.c:737
 msgid "Select Disk Image to Attach"
 msgstr "éæèéåçççæåæ"
 
-#: ../src/palimpsest/gduwindow.c:646
+#: ../src/disks/gduwindow.c:741
 msgid "_Attach"
 msgstr "éå(_A)"
 
 #. Add a RO check button that defaults to RO
-#: ../src/palimpsest/gduwindow.c:652
+#: ../src/disks/gduwindow.c:747
 msgid "Set up _read-only loop device"
 msgstr "èååèç loop èç(_R)"
 
-#: ../src/palimpsest/gduwindow.c:653
+#: ../src/disks/gduwindow.c:748
 msgid ""
 "If checked, the loop device will be read-only. This is useful if you don't "
 "want the underlying file to be modified"
 msgstr "åææåæééïloop èçæèæåèãåæääæèååçææèäæçèéæåæåå"
 
 #. Translators: Shown for a read-only device. The %s is the device file, e.g. /dev/sdb1
-#: ../src/palimpsest/gduwindow.c:1515
+#: ../src/disks/gduwindow.c:1689
 #, 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:1721
+msgctxt "job-remaining-exceeded"
+msgid "Almost done..."
+msgstr "åäåæâ"
+
+#: ../src/disks/gduwindow.c:1726
+#, 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:1882
+#, fuzzy
+msgid "Connected to another seat"
+msgstr "åæèåäååæ"
+
+#: ../src/disks/gduwindow.c:2183
 msgctxt "partition type"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/palimpsest/gduwindow.c:1849
+#: ../src/disks/gduwindow.c:2215
 msgid "Extended Partition"
 msgstr "åäååå"
 
 #. Translators: Use for mount point '/' simply because '/' is too small to hit as a hyperlink
 #.
-#: ../src/palimpsest/gduwindow.c:1890
+#: ../src/disks/gduwindow.c:2256
 msgid "Filesystem Root"
 msgstr "ææççæ"
 
 #. Translators: Shown next to "In Use". The first %s is the mount point, e.g. /media/foobar
-#: ../src/palimpsest/gduwindow.c:1898
+#: ../src/disks/gduwindow.c:2264
 #, c-format
 msgid "Yes, mounted at %s"
 msgstr "æïæèæ %s"
@@ -2085,84 +2709,126 @@ msgstr "æïæèæ %s"
 #. Translators: Shown when the device is not mounted next to the "In Use" label
 #. Translators: Shown if the swap device is not in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is not unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1904 ../src/palimpsest/gduwindow.c:1940
-#: ../src/palimpsest/gduwindow.c:1966
+#: ../src/disks/gduwindow.c:2270 ../src/disks/gduwindow.c:2306
+#: ../src/disks/gduwindow.c:2332
 msgid "No"
 msgstr "å"
 
 #. Translators: Shown if the swap device is in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1934 ../src/palimpsest/gduwindow.c:1960
+#: ../src/disks/gduwindow.c:2300 ../src/disks/gduwindow.c:2326
 msgid "Yes"
 msgstr "æ"
 
 #. Translators: used to convey free space for partitions - the %s is the
 #. * partition table format e.g. "Master Boot Record" or "GUID Partition Table"
 #.
-#: ../src/palimpsest/gduwindow.c:2039
+#: ../src/disks/gduwindow.c:2459
 #, c-format
 msgid "Unallocated Space (%s)"
 msgstr "æéçççé (%s)"
 
 #. Translators: used to convey free space for partitions (partition table format not known)
-#: ../src/palimpsest/gduwindow.c:2044
+#: ../src/disks/gduwindow.c:2464
 msgid "Unallocated Space"
 msgstr "æéçççé"
 
-#: ../src/palimpsest/gduwindow.c:2400
+#: ../src/disks/gduwindow.c:2831
+msgid "An error occurred when trying to put the drive into standby mode"
+msgstr "çåèèççæéåååæåæççéè"
+
+#: ../src/disks/gduwindow.c:2877
+msgid "An error occurred when trying to wake up the drive from standby mode"
+msgstr "çåèèççæåååæååéæççéè"
+
+#: ../src/disks/gduwindow.c:2952
 msgid "Error mounting filesystem"
 msgstr "æèææççæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2440
+#: ../src/disks/gduwindow.c:2992
 msgid "Error unmounting filesystem"
 msgstr "åèææççæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2519
+#: ../src/disks/gduwindow.c:3073
 msgid "Error deleting partition"
 msgstr "åéåååæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2535
+#: ../src/disks/gduwindow.c:3089
 msgid "Are you sure you want to delete the partition?"
 msgstr "çåèåéæåååï"
 
-#: ../src/palimpsest/gduwindow.c:2536
+#: ../src/disks/gduwindow.c:3090
 msgid "All data on the partition will be lost"
 msgstr "åååäçææèæåææå"
 
-#: ../src/palimpsest/gduwindow.c:2537
+#: ../src/disks/gduwindow.c:3091
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/palimpsest/gduwindow.c:2568
+#: ../src/disks/gduwindow.c:3122
 msgid "Error ejecting media"
 msgstr "éååéæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2620
+#: ../src/disks/gduwindow.c:3174
 msgid "Error locking encrypted device"
 msgstr "éåååçèçæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2661
+#: ../src/disks/gduwindow.c:3215
 msgid "Error starting swap"
 msgstr "ååçæåæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2698
+#: ../src/disks/gduwindow.c:3252
 msgid "Error stopping swap"
 msgstr "åæçæåæççéè"
 
-#, fuzzy
-#~| msgid "Attach Disk Image..."
-#~ msgid "Attach Disk _Image..."
-#~ msgstr "æäççæåæ(_I)â"
+#: ../src/disks/gduwindow.c:3294
+msgid "Error setting autoclear flag"
+msgstr "èå autoclear æææççéè"
+
+#: ../src/disks/gduwindow.c:3347 ../src/disks/gduwindow.c:3402
+msgid "Error canceling job"
+msgstr "åæåäæççéè"
+
+#~ msgid "Normalized"
+#~ msgstr "æåå"
+
+#~ msgid "Updates"
+#~ msgstr "ææ"
+
+#~ msgid "%.1f hour"
+#~ msgid_plural "%.1f hours"
+#~ msgstr[0] "%.1f åæ"
+
+#~ msgid "%.1f minute"
+#~ msgid_plural "%.1f minutes"
+#~ msgstr[0] "%.1f åé"
 
-#~ msgid "_About Disks"
-#~ msgstr "éæçç(_A)"
+#~ msgid "%.1f second"
+#~ msgid_plural "%.1f seconds"
+#~ msgstr[0] "%.1f çé"
 
-#~ msgid "_Quit"
-#~ msgstr "éé(_Q)"
+#~ msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
+#~ msgstr "åçåææ 24 åæåååççççææçåå (éåççéè)"
 
-#~| msgid "_Restore"
-#~ msgid "Reset"
-#~ msgstr "éè"
+#~ msgid ""
+#~ "Failure is a sign the disk exceeded its intended design life period (Old-"
+#~ "Age)"
+#~ msgstr "åçåææççæåèéåèèçäçåé (èå)"
+
+#~ msgid "Every time data is collected (Online)"
+#~ msgstr "ææèæéææé (äç)"
+
+#~ msgid "Only during off-line activities (Not Online)"
+#~ msgstr "ååéçæåæéïéäççæï"
+
+#~ msgid "Name"
+#~ msgstr "åç"
+
+#~ msgid "All data on the volume will be lost"
+#~ msgstr "åååäçææèæåææå"
+
+#~ msgid "Less than a minute"
+#~ msgstr "åæäåé"
 
 #~ msgid ""
 #~ "The name to use for the unlocked device - the device is set up as the "
@@ -2203,12 +2869,6 @@ msgstr "åæçæåæççéè"
 #~ msgid "%d seconds"
 #~ msgstr "%d ç"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d å"
-
-#~ msgid "%d hours"
-#~ msgstr "%d æ"
-
 #~ msgid "Checked if an entry in the /etc/crypttab file exists for the device"
 #~ msgstr "ææéåèçå /etc/crypttab ææäæåååéç"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 0a805be..963fbbe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gnome-disk-utility 3.3.93\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-08 16:02+0800\n"
-"PO-Revision-Date: 2012-03-06 01:43+0800\n"
-"Last-Translator: Cheng-Chia Tseng <pswo10680 gmail com>\n"
+"POT-Creation-Date: 2012-07-12 09:07+0800\n"
+"PO-Revision-Date: 2012-07-11 10:26+0800\n"
+"Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
@@ -18,16 +18,25 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/palimpsest.desktop.in.h:1 ../data/ui/about-dialog.ui.h:3
-#: ../src/palimpsest/gduwindow.c:888
+#: ../data/gnome-disk-image-mounter.desktop.in.h:1
+#: ../src/disk-image-mounter/main.c:98
+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:992
 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:1
+#: ../data/ui/about-dialog.ui.h:2
 msgid ""
 "Copyright  2008-2012 Red Hat, Inc.\n"
 "Copyright  2008-2012 David Zeuthen"
@@ -47,282 +56,556 @@ msgstr ""
 "zh-l10n lists linux org tw\n"
 "Chao-Hsiung Liao <j_h_liau yahoo com tw>, 2011."
 
-#: ../data/ui/change-passphrase-dialog.ui.h:1
-msgid "<big>Change Passphrase</big>"
-msgstr "<big>æèåè</big>"
+#: ../data/ui/app-menu.ui.h:1
+msgid "Attach Disk _Image..."
+msgstr "éåççæåæ(_I)â"
 
-#: ../data/ui/change-passphrase-dialog.ui.h:2
-#: ../data/ui/edit-dos-partition-dialog.ui.h:3
+#: ../data/ui/app-menu.ui.h:2
+msgid "_About Disks"
+msgstr "éæçç(_A)"
+
+#: ../data/ui/app-menu.ui.h:3
+msgid "_Quit"
+msgstr "éé(_Q)"
+
+#: ../data/ui/benchmark-dialog.ui.h:1
+msgid "_Start Benchmark..."
+msgstr "éåæèèæ(_S)â"
+
+#: ../data/ui/benchmark-dialog.ui.h:2
+msgid "_Abort Benchmark"
+msgstr "éææèèæ(_A)"
+
+#: ../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 "éåæèèæ(_S)â"
+
+#: ../data/ui/benchmark-dialog.ui.h:10
+msgid ""
+"Benchmarking involves measuring the transfer rate on various area of the "
+"device as well as measuring how long it takes to seek from one random area "
+"to another. Please back up important data before using the write benchmark."
+msgstr ""
+"Benchmarking ååæéèçåååååçåèçäååäåäæåååæåäåäæå"
+"èèåäæéãåäçååèæäåèååäéèçèæã"
+
+#: ../data/ui/benchmark-dialog.ui.h:11
+msgid "<b>Transfer Rate</b>"
+msgstr "<b>åèç</b>"
+
+#: ../data/ui/benchmark-dialog.ui.h:12
+msgid "Number of S_amples"
+msgstr "åæçæç(_A)"
+
+#: ../data/ui/benchmark-dialog.ui.h:13
+msgid "Sample S_ize (MiB)"
+msgstr "åæçåå(M_iB)"
+
+#: ../data/ui/benchmark-dialog.ui.h:14
+msgid "Also perform _write-benchmark"
+msgstr "äéèååçæèèæ(_W)"
+
+#: ../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 ""
+"æåææèèå/ååç MiB æ (1048576 äåç)ãååæææççèæççèæç"
+"æïäåææèèèåçæéã"
+
+#: ../data/ui/benchmark-dialog.ui.h:20
+msgid "<b>Access Time</b>"
+msgstr "<b>ååæé</b>"
+
+#: ../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:2
-#: ../data/ui/edit-partition-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 "æè(_H)"
 
+#: ../data/ui/change-passphrase-dialog.ui.h:2
+msgid "<big>Change Passphrase</big>"
+msgstr "<big>æèåè</big>"
+
 #: ../data/ui/change-passphrase-dialog.ui.h:3
-#: ../data/ui/filesystem-create.ui.h:1
-msgid "C_onfirm Passphrase"
-msgstr "çèåè(_O)"
+msgid "Curr_ent Passphrase"
+msgstr "çåçåè(_E)"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:4
-#: ../data/ui/filesystem-create.ui.h:2
-msgid "Check this box to see the passphrases entered above"
-msgstr "æåéåæååäçåäéèåçåè"
+msgid "Enter current passphrase used to protect the data"
+msgstr "èåçåçääèèæçåè"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:5
-#: ../data/ui/filesystem-create.ui.h:3
-msgid "Confirm passphrase entered above"
-msgstr "çèäéèåçåè"
+#: ../data/ui/filesystem-create.ui.h:12
+msgid "Sho_w Passphrases"
+msgstr "éçåè(_W)"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:6
-msgid "Curr_ent Passphrase"
-msgstr "çåçåè(_E)"
+#: ../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
-msgid "Enter current passphrase used to protect the data"
-msgstr "èåçåçääèèæçåè"
+#: ../data/ui/filesystem-create.ui.h:11
+msgid "Confirm passphrase entered above"
+msgstr "çèäéèåçåè"
 
 #: ../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
-msgid "New _Passphrase"
-msgstr "æçåè(_N)"
+#: ../data/ui/filesystem-create.ui.h:9
+msgid "C_onfirm Passphrase"
+msgstr "çèåè(_O)"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:10
-#: ../data/ui/filesystem-create.ui.h:6
-msgid "Sho_w Passphrases"
-msgstr "éçåè(_W)"
+msgid "New _Passphrase"
+msgstr "æçåè(_N)"
 
 #: ../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 "Copying data to disk image..."
-msgstr "æåèèèæåççæåæâ"
+msgid "_Start Creating..."
+msgstr "éååç(_S)â"
 
 #: ../data/ui/create-disk-image-dialog.ui.h:3
+#: ../data/ui/edit-crypttab-dialog.ui.h:3
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:5
+#: ../data/ui/filesystem-create.ui.h:2
+msgid "_Name"
+msgstr "åç(_N)"
+
+#: ../data/ui/create-disk-image-dialog.ui.h:4
 msgid "Save in _folder"
 msgstr "ååæèæå(_F)"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:4
+#: ../data/ui/create-disk-image-dialog.ui.h:5
 msgid "Select a Folder"
 msgstr "éæèæå"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:5
-#: ../data/ui/edit-crypttab-dialog.ui.h:12
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:13
-#: ../data/ui/filesystem-create.ui.h:11
-msgid "_Name"
-msgstr "åç(_N)"
-
 #: ../data/ui/create-disk-image-dialog.ui.h:6
-msgid "_Start Creating..."
-msgstr "éååç(_S)â"
+msgid "Copying data to disk image..."
+msgstr "æåèèèæåççæåæâ"
 
 #: ../data/ui/create-partition-dialog.ui.h:1
-msgid "<big>Contents</big>"
-msgstr "<big>åå</big>"
+msgid "C_reate"
+msgstr "åç(_R)"
 
 #: ../data/ui/create-partition-dialog.ui.h:2
 msgid "<big>Create Partition</big>"
 msgstr "<big>åçååå</big>"
 
 #: ../data/ui/create-partition-dialog.ui.h:3
-msgid "C_reate"
-msgstr "åç(_R)"
+msgid "Partition _Size"
+msgstr "ååååé(_S)"
 
 #: ../data/ui/create-partition-dialog.ui.h:4
-msgid "Free Space _Following"
-msgstr "åççåççé(_F)"
+msgid "The size of the partition to create, in megabytes"
+msgstr "èåççååååéïä MB è"
 
 #: ../data/ui/create-partition-dialog.ui.h:5
 msgid "MB"
 msgstr "MB"
 
 #: ../data/ui/create-partition-dialog.ui.h:6
-msgid "Partition _Size"
-msgstr "ååååé(_S)"
+msgid "Free Space _Following"
+msgstr "åççåççé(_F)"
 
 #: ../data/ui/create-partition-dialog.ui.h:7
 msgid "The free space following the partition, in megabytes"
 msgstr "åååååçåéçéïä MB è"
 
 #: ../data/ui/create-partition-dialog.ui.h:8
-msgid "The size of the partition to create, in megabytes"
-msgstr "èåççååååéïä MB è"
-
-#: ../data/ui/edit-crypttab-dialog.ui.h:1
-msgid ""
-"If checked, additional authorization is required to unlock the device [x-"
-"udisks-auth]"
-msgstr "åææåæééïæèæéåçéèäèéèç [x-udisks-auth]"
+msgid "<big>Contents</big>"
+msgstr "<big>åå</big>"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:2
-msgid "If checked, the device will be unlocked at startup [!noauto]"
-msgstr "åææåæééïèçæåååååæèé [!noauto]"
+#: ../data/ui/disk-settings-dialog.ui.h:1
+msgid "_Standby Timeout"
+msgstr "ååéæ(_S)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:3
-msgid "Opt_ions"
-msgstr "éé(_I)"
+#: ../data/ui/disk-settings-dialog.ui.h:2
+msgid "Enter Standby After"
+msgstr "éååååçå"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:4
-msgid "Options to use when unlocking the device"
-msgstr "èéèçæäççéé"
+#: ../data/ui/disk-settings-dialog.ui.h:3
+msgid "_Advanced Power Management"
+msgstr "éééæçç(_A)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:5
-msgid "Passphrase File"
-msgstr "åèææ"
+#: ../data/ui/disk-settings-dialog.ui.h:4
+msgid "APM Level"
+msgstr "APM åç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:6
+#: ../data/ui/disk-settings-dialog.ui.h:5
 msgid ""
-"Passphrase of the device or empty to request from user when setting up the "
-"device"
-msgstr "èççåèïæäæççäåèåèçæèæäçè"
+"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/edit-crypttab-dialog.ui.h:7
-msgid "Require additional authori_zation to unlock"
-msgstr "éèéåéèäèé(_Z)"
+#: ../data/ui/disk-settings-dialog.ui.h:6
+msgid "Automatic Aco_ustic Management"
+msgstr "èååéçç(_U)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:8
-#: ../data/ui/unlock-device-dialog.ui.h:2
-msgid "Sho_w passphrase"
-msgstr "éçåè(_W)"
+#: ../data/ui/disk-settings-dialog.ui.h:7
+msgid "Vendor Recommended"
+msgstr "åèçåå"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:9
-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>/"
-"etc/crypttab</b> file"
-msgstr ""
-"éé<i>èåååéé</i> äççèççååééèåèãééåæè <b>/etc/"
-"crypttab</b> ææåçæç"
+#: ../data/ui/disk-settings-dialog.ui.h:8
+msgid "AAM Level"
+msgstr "AAM åç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:10
-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>/ äèç"
+#: ../data/ui/disks.ui.h:1
+msgid "Create a new partition..."
+msgstr "åçæçåååâ"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:11
-msgid "_Automatic Encryption Options"
-msgstr "èåååéé(_A)"
+#: ../data/ui/disks.ui.h:2
+msgid "Mount the filesystem"
+msgstr "æèææçç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:13
-#: ../data/ui/filesystem-create.ui.h:12 ../data/ui/unlock-device-dialog.ui.h:3
-msgid "_Passphrase"
-msgstr "åè(_P)"
+#: ../data/ui/disks.ui.h:3
+msgid "Unmount the filesystem"
+msgstr "åèææçç"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:14
-msgid "_Unlock at startup"
-msgstr "ååååæèé(_U)"
+#: ../data/ui/disks.ui.h:4
+msgid "Eject the media"
+msgstr "éåéååé"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:1
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
-#: ../data/ui/edit-partition-dialog.ui.h:1
-msgid "<big>Edit Partition</big>"
-msgstr "<big>çèååå</big>"
+#: ../data/ui/disks.ui.h:5
+msgid "Unlock the encrypted device"
+msgstr "èéååçèç"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:2
-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 "
-"the <i>active</i> partition"
-msgstr ""
-"åèéæèåçåçäèæåäèèå OS æççææãææååæéåææçååå"
-"äèèç <i>active</i> ååå"
+#: ../data/ui/disks.ui.h:6
+msgid "Activate the swap space"
+msgstr "åççæåçé"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:4
-msgid "The partition type as a 8-bit unsigned integer"
-msgstr "åååéåç 8 äåæçççææ"
+#: ../data/ui/disks.ui.h:7
+msgid "Deactivate the swap space"
+msgstr "åççæåçé"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:5
-msgid "_Bootable"
-msgstr "åéæ(_B)"
+#: ../data/ui/disks.ui.h:8
+msgid "Lock the encrypted device"
+msgstr "éåååçèç"
 
-#: ../data/ui/edit-dos-partition-dialog.ui.h:6
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:16
-#: ../data/ui/edit-partition-dialog.ui.h:3
-#: ../data/ui/filesystem-create.ui.h:13
-msgid "_Type"
-msgstr "éå(_T)"
+#: ../data/ui/disks.ui.h:9
+msgid "More actions..."
+msgstr "æååäâ"
 
-#: ../data/ui/edit-filesystem-dialog.ui.h:1
-msgid "<big>Change Filesystem Label</big>"
-msgstr "<big>æèææççæç</big>"
+#: ../data/ui/disks.ui.h:10
+msgid "Delete partition..."
+msgstr "åéåååâ"
 
-#: ../data/ui/edit-filesystem-dialog.ui.h:3
-msgid "_Label"
-msgstr "æç(_L)"
+#: ../data/ui/disks.ui.h:11
+msgid "Attach Disk Image..."
+msgstr "éåççæåæâ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:1
-msgid "Display _Name"
-msgstr "éçåç(_N)"
+#: ../data/ui/disks.ui.h:12
+msgid "Detach Disk Image"
+msgstr "åéççæåæ"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:2
-msgid "Filesystem _Type"
-msgstr "ææççéå(_T)"
+#: ../data/ui/disks.ui.h:13
+msgid "Select a device"
+msgstr "éæèç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:3
-msgid "I_dentify As"
-msgstr "èåç(_A)"
+#: ../data/ui/disks.ui.h:14
+msgid "Model"
+msgstr "åè"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:4
-msgid "Icon Na_me"
-msgstr "åçåç(_M)"
+#: ../data/ui/disks.ui.h:15
+msgid "Serial Number"
+msgstr "åè"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:5
-msgid ""
-"If checked, additional authorization is required to mount the device [x-"
-"udisks-auth]"
-msgstr "åææåæééïæèæéåçéèäæèèç [x-udisks-auth]"
+#: ../data/ui/disks.ui.h:16
+msgid "World Wide Name"
+msgstr "äçæåç(WWN)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:6
+#. 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:1517
+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 "<b>_Volumes</b>"
+msgstr "<b>ååå(_V)</b>"
+
+#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap (version 2)'
+#: ../data/ui/disks.ui.h:26
+msgid "Contents"
+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/disks.ui.h:47
+msgid "Benchmark Volume..."
+msgstr "ååååèæâ"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:1
+msgid "_Automatic Encryption Options"
+msgstr "èåååéé(_A)"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:2
 msgid ""
-"If checked, the device is always shown in the user interface no matter what "
-"its directory is [x-gvfs-show]"
+"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>/"
+"etc/crypttab</b> file"
 msgstr ""
-"åææåæééïèçæéæéçåäçèäéäïäçåççéçä [x-gvfs-show]"
+"éé<i>èåååéé</i> äççèççååééèåèãééåæè <b>/etc/"
+"crypttab</b> ææåçæç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:7
-msgid "If checked, the device will be mounted at startup [!noauto]"
-msgstr "åææåæééïèçäæåååååææè [!noauto]"
+#: ../data/ui/edit-crypttab-dialog.ui.h:4
+msgid "Opt_ions"
+msgstr "éé(_I)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:8
+#: ../data/ui/edit-crypttab-dialog.ui.h:5
 msgid ""
-"If set, the name of the icon to use in the device in the user interface [x-"
-"gvfs-icon=]"
-msgstr "åæèåïåççåçæçåäçèäéçèçä [x-gvfs-icon=]"
+"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>/ äèç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:9
+#: ../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
+msgid "Passphrase File"
+msgstr "åèææ"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:8
+#: ../data/ui/unlock-device-dialog.ui.h:3
+msgid "Sho_w passphrase"
+msgstr "éçåè(_W)"
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:9
 msgid ""
-"If set, the name to use for the device in the user interface [x-gvfs-name=]"
-msgstr "åæèåïéåèçåäçèäéääççåç [x-gvfs-name=]"
+"Passphrase of the device or empty to request from user when setting up the "
+"device"
+msgstr "èççåèïæäæççäåèåèçæèæäçè"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:10
-msgid "Mount Opt_ions"
-msgstr "æèéé(_I)"
+#: ../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 "åè(_P)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:11
-msgid "Mount _Point"
-msgstr "æèé(_P)"
+#: ../data/ui/edit-crypttab-dialog.ui.h:11
+msgid "_Unlock at startup"
+msgstr "ååååæèé(_U)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:12
-msgid "Mount at _startup"
-msgstr "ååååææè(_S)"
+#: ../data/ui/edit-crypttab-dialog.ui.h:12
+msgid "If checked, the device will be unlocked at startup [!noauto]"
+msgstr "åææåæééïèçæåååååæèé [!noauto]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:13
-msgid "Require additional authori_zation to mount"
-msgstr "éèéåéèæèæè(_Z)"
+#: ../data/ui/edit-crypttab-dialog.ui.h:13
+msgid "Require additional authori_zation to unlock"
+msgstr "éèéåéèäèé(_Z)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:14
-msgid "Sho_w in user interface"
-msgstr "éçäçèäé(_W)"
+#: ../data/ui/edit-crypttab-dialog.ui.h:14
+msgid ""
+"If checked, additional authorization is required to unlock the device [x-"
+"udisks-auth]"
+msgstr "åææåæééïæèæéåçéèäèéèç [x-udisks-auth]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:15
+#: ../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: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 "éå(_T)"
+
+#: ../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
+msgid "_Bootable"
+msgstr "åéæ(_B)"
+
+#: ../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 "
+"the <i>active</i> partition"
+msgstr ""
+"åèéæèåçåçäèæåäèèå OS æççææãææååæéåææçååå"
+"äèèç <i>active</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:3
+msgid "_Label"
+msgstr "æç(_L)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:1
+msgid "_Automatic Mount Options"
+msgstr "èåæèéé(_A)"
+
+#: ../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/"
@@ -331,7 +614,11 @@ msgstr ""
 "éé<i>èåååéé</i> äççèççæèéèæèééãééåæè <b>>/etc/"
 "fstab</b> ææåçæç"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:16
+#: ../data/ui/edit-fstab-dialog.ui.h:3
+msgid "I_dentify As"
+msgstr "èåç(_A)"
+
+#: ../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"
@@ -339,59 +626,109 @@ msgstr ""
 "<b>çåçèçææ</b> - äçå <b>/dev/disk</b> éåéçäçèéçäæåéç"
 "ççå"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:17
+#: ../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"
+msgstr "çåçèçææ - äçå /dev/disk éåéçäçèéçäæåéçççå"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:6
+msgid "Mount _Point"
+msgstr "æèé(_P)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:7
+msgid "Filesystem _Type"
+msgstr "ææççéå(_T)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:8
 msgid "The directory to mount the device in"
 msgstr "çäæèèçççé"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:18
+#: ../data/ui/edit-fstab-dialog.ui.h:9
 msgid "The filesystem type to use"
 msgstr "èäççææççéå"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:19
-msgid "The mount options stored in the <b>/etc/fstab</b> file"
-msgstr "ååæ <b>/etc/fstab</b> ææäçæèéé"
+#: ../data/ui/edit-fstab-dialog.ui.h:10
+msgid "Display _Name"
+msgstr "éçåç(_N)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:20
+#: ../data/ui/edit-fstab-dialog.ui.h:11
 msgid ""
-"The special device file - use symlinks in the /dev/disk hierarchy to control "
-"the scope of the entry"
-msgstr "çåçèçææ - äçå /dev/disk éåéçäçèéçäæåéçççå"
+"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
+msgid "Icon Na_me"
+msgstr "åçåç(_M)"
+
+#: ../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
+msgid "Sho_w in user interface"
+msgstr "éçäçèäé(_W)"
+
+#: ../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]"
+msgstr ""
+"åææåæééïèçæéæéçåäçèäéäïäçåççéçä [x-gvfs-show]"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:16
+msgid "Require additional authori_zation to mount"
+msgstr "éèéåéèæèæè(_Z)"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:17
+msgid ""
+"If checked, additional authorization is required to mount the device [x-"
+"udisks-auth]"
+msgstr "åææåæééïæèæéåçéèäæèèç [x-udisks-auth]"
+
+#: ../data/ui/edit-fstab-dialog.ui.h:18
+msgid "Mount at _startup"
+msgstr "ååååææè(_S)"
+
+#: ../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
+msgid "Mount Opt_ions"
+msgstr "æèéé(_I)"
 
 #: ../data/ui/edit-fstab-dialog.ui.h:21
-msgid "_Automatic Mount Options"
-msgstr "èåæèéé(_A)"
-
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:3
-msgid "Do Not _Automount"
-msgstr "äèèåæè(_A)"
+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
-msgid "H_idden"
-msgstr "éè(_I)"
-
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:5
-msgid ""
-"If set, some OSes may hide the contents of the partition in their user "
-"interfaces"
-msgstr "åæèåïæä OS æåååçäçèäéäéèåååçåå"
+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
 msgid ""
-"If set, some OSes may mount or use the contents of the partition as read-"
-"only instead of read-write"
-msgstr "åæèåïæä OS æäåèèéåèåçæåæèæäçåååçåå"
+"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> "
+"directory"
+msgstr ""
+"ååååç (æå 36 åèåçåå)ãåæææèéé <b>/dev/disk/by-partlabel</"
+"b> çéäççèéçäåçèççèæåæç"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:7
-msgid "If set, some OSes may not automount the contents of the partition"
-msgstr "åæèåïæä OS åèäæèåæèéååååçåå"
+msgid "_System partition"
+msgstr "ççååå(_S)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:8
 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"
+"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 "
+"overwrite the contents"
 msgstr ""
-"åçç BIOS éæèæãéçåæäéæçé(MBR)ç <i>bootable</i> ææãåéå"
-"åçæå MBR ççääç GPT åååæ"
+"çäèçéååååååäçååæ OS/åèéäæéçãèçåææäèåéæèè"
+"éäåå"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:9
 msgid "Legacy BIOS _Bootable"
@@ -399,323 +736,178 @@ msgstr "åç _BIOS éæååå"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:10
 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> "
-"directory"
+"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"
 msgstr ""
-"ååååç (æå 36 åèåçåå)ãåæææèéé <b>/dev/disk/by-partlabel</"
-"b> çéäççèéçäåçèççèæåæç"
+"åçç BIOS éæèæãéçåæäéæçé(MBR)ç <i>bootable</i> ææãåéå"
+"åçæå MBR ççääç GPT åååæ"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:11
-msgid "The partition type represented as a 32-bit <i>GUID</i>"
-msgstr "åååéåæä 32 äå <i>GUID</i> äåç"
+msgid "_Read-Only"
+msgstr "åè(_R)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:12
 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 "
-"overwrite the contents"
-msgstr ""
-"çäèçéååååååäçååæ OS/åèéäæéçãèçåææäèåéæèè"
-"éäåå"
+"If set, some OSes may mount or use the contents of the partition as read-"
+"only instead of read-write"
+msgstr "åæèåïæä OS æäåèèéåèåçæåæèæäçåååçåå"
+
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:13
+msgid "H_idden"
+msgstr "éè(_I)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:14
-msgid "_Read-Only"
-msgstr "åè(_R)"
+msgid ""
+"If set, some OSes may hide the contents of the partition in their user "
+"interfaces"
+msgstr "åæèåïæä OS æåååçäçèäéäéèåååçåå"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:15
-msgid "_System partition"
-msgstr "ççååå(_S)"
+msgid "Do Not _Automount"
+msgstr "äèèåæè(_A)"
+
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:16
+msgid "If set, some OSes may not automount the contents of the partition"
+msgstr "åæèåïæä OS åèäæèåæèéååååçåå"
+
+#: ../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"
+msgstr ""
+"ææççäççåçãåæææèéé <b>/dev/disk/by-label</b> çéäççèéç"
+"åçèççèæåæåå"
 
 #: ../data/ui/filesystem-create.ui.h:4
-msgid "Enter passphrase used to protect the data"
-msgstr "èåçääèèæçåè"
+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"
+msgstr ""
+"ææççäççåçãåæææèéé /dev/disk/by-label çéäççèéçåçè"
+"ççèæåæåå"
 
 #: ../data/ui/filesystem-create.ui.h:5
 msgid "F_ilesystem"
 msgstr "ææçç(_I)"
 
-#: ../data/ui/filesystem-create.ui.h:7
+#: ../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>"
 msgstr "èåççèèææççéåïäå <i>btrfs</i>ã<i>xfs</i> æ <i>swap</i>"
 
-#: ../data/ui/filesystem-create.ui.h:8
+#: ../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:9
-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"
-msgstr ""
-"ææççäççåçãåæææèéé /dev/disk/by-label çéäççèéçåçè"
-"ççèæåæåå"
-
 #: ../data/ui/filesystem-create.ui.h:10
-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"
-msgstr ""
-"ææççäççåçãåæææèéé <b>/dev/disk/by-label</b> çéäççèéç"
-"åçèççèæåæåå"
+msgid "Enter passphrase used to protect the data"
+msgstr "èåçääèèæçåè"
 
-#: ../data/ui/format-disk-dialog.ui.h:1
-msgid "<big>Format Disk</big>"
-msgstr "<big>æååçç</big>"
+#: ../data/ui/filesystem-create.ui.h:14 ../data/ui/format-disk-dialog.ui.h:4
+msgid "_Erase"
+msgstr "æé(_E)"
 
-#: ../data/ui/format-disk-dialog.ui.h:2 ../data/ui/format-volume-dialog.ui.h:2
+#: ../data/ui/format-disk-dialog.ui.h:1 ../data/ui/format-volume-dialog.ui.h:1
 msgid "_Format..."
 msgstr "æåå(_F)â"
 
+#: ../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 "ååå(_P)"
 
-#: ../data/ui/format-volume-dialog.ui.h:1
+#: ../data/ui/format-volume-dialog.ui.h:2
 msgid "<big>Format Volume</big>"
 msgstr "<big>æååååå</big>"
 
-#: ../data/ui/palimpsest.ui.h:1
-msgid "<b>_Volumes</b>"
-msgstr "<b>ååå(_V)</b>"
-
-#: ../data/ui/palimpsest.ui.h:2
-msgid "Activate the swap space"
-msgstr "åççæåçé"
-
-#. Translators: This string is used as the column title in the treeview for the assessment of the attribute
-#: ../data/ui/palimpsest.ui.h:3 ../src/palimpsest/gduatasmartdialog.c:1632
-msgid "Assessment"
-msgstr "èä"
-
-#: ../data/ui/palimpsest.ui.h:4
-msgid "Attach Disk Image..."
-msgstr "éåççæåæâ"
-
-#. The filename or URI of the file that is used as backing store for the loop device.
-#: ../data/ui/palimpsest.ui.h:6
-msgid "Backing File"
-msgstr "åäææ"
-
-#: ../data/ui/palimpsest.ui.h:7
-msgid "Change Passphrase..."
-msgstr "ææåèâ"
-
-#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap (version 2)'
-#: ../data/ui/palimpsest.ui.h:9
-msgid "Contents"
-msgstr "åå"
-
-#: ../data/ui/palimpsest.ui.h:10
-msgid "Create Disk Image..."
-msgstr "åçççæåæâ"
-
-#: ../data/ui/palimpsest.ui.h:11
-msgid "Create a new partition..."
-msgstr "åçæçåååâ"
-
-#: ../data/ui/palimpsest.ui.h:12
-msgid "Deactivate the swap space"
-msgstr "åççæåçé"
-
-#: ../data/ui/palimpsest.ui.h:13
-msgid "Delete partition..."
-msgstr "åéåååâ"
-
-#: ../data/ui/palimpsest.ui.h:14
-msgid "Detach Disk Image"
-msgstr "åéççæåæ"
-
-#: ../data/ui/palimpsest.ui.h:15
-msgid "Device"
-msgstr "èç"
-
-#: ../data/ui/palimpsest.ui.h:16
-msgid "Edit Encryption Options..."
-msgstr "çèååéé..."
-
-#: ../data/ui/palimpsest.ui.h:17
-msgid "Edit Filesystem Label..."
-msgstr "çèææççæçâ"
-
-#: ../data/ui/palimpsest.ui.h:18
-msgid "Edit Mount Options..."
-msgstr "çèæèéé..."
-
-#: ../data/ui/palimpsest.ui.h:19
-msgid "Edit Partition Type..."
-msgstr "çèåååéåâ"
-
-#: ../data/ui/palimpsest.ui.h:20
-msgid "Eject media"
-msgstr "éååé"
-
-#: ../data/ui/palimpsest.ui.h:21
-msgid "Eject the media"
-msgstr "éåéååé"
-
-#: ../data/ui/palimpsest.ui.h:22
-msgid "Format Disk..."
-msgstr "æååççâ"
-
-#: ../data/ui/palimpsest.ui.h:23
-msgid "Format..."
-msgstr "æååâ"
-
-#: ../data/ui/palimpsest.ui.h:24
-msgid "In Use"
-msgstr "äçä"
-
-#: ../data/ui/palimpsest.ui.h:25
-msgid "Lock the encrypted device"
-msgstr "éåååçèç"
-
-#: ../data/ui/palimpsest.ui.h:26
-msgid "Media"
-msgstr "åé"
-
-#: ../data/ui/palimpsest.ui.h:27
-msgid "Model"
-msgstr "åè"
-
-#: ../data/ui/palimpsest.ui.h:28
-msgid "More actions..."
-msgstr "æååäâ"
-
-#: ../data/ui/palimpsest.ui.h:29
-msgid "Mount the filesystem"
-msgstr "æèææçç"
-
-#: ../data/ui/palimpsest.ui.h:30
-msgid "Partition Type"
-msgstr "åååéå"
-
-#: ../data/ui/palimpsest.ui.h:31
-msgid "Restore Disk Image..."
-msgstr "éåççæåæâ"
-
-#: ../data/ui/palimpsest.ui.h:32
-msgid "Select a device"
-msgstr "éæèç"
-
-#: ../data/ui/palimpsest.ui.h:33
-msgid "Serial Number"
-msgstr "åè"
-
-#: ../data/ui/palimpsest.ui.h:34
-msgid "Size"
-msgstr "åé"
-
-#: ../data/ui/palimpsest.ui.h:35
-msgid "Unlock the encrypted device"
-msgstr "èéååçèç"
-
-#: ../data/ui/palimpsest.ui.h:36
-msgid "Unmount the filesystem"
-msgstr "åèææçç"
-
-#: ../data/ui/palimpsest.ui.h:37
-msgid "View SMART Data..."
-msgstr "æè SMART èæâ"
-
-#: ../data/ui/palimpsest.ui.h:38
-#, fuzzy
-msgid "World Wide Name"
-msgstr "äçæåç(WWN):"
-
 #: ../data/ui/restore-disk-image-dialog.ui.h:1
 msgid "<big>Restore Disk Image</big>"
 msgstr "<big>éåççæåæ</big>"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:2
-msgid "Copying data to device..."
-msgstr "èèèæèèçâ"
+msgid "_Image to restore"
+msgstr "èéåçæåæ(_I)"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:3
 msgid "Select Disk Image to restore"
 msgstr "éæèéåçççæåæ"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:4
-msgid "_Image to restore"
-msgstr "èéåçæåæ(_I)"
+msgid "Copying data to device..."
+msgstr "èèèæèèçâ"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:5
 msgid "_Start Restoring..."
 msgstr "éåéå(_S)â"
 
 #: ../data/ui/smart-dialog.ui.h:1
-msgid "<b>SMART _Attributes</b>"
-msgstr "<b>SM_ART åæ</b>"
+msgid "_Start Self-test..."
+msgstr "éåèææè(_S)â"
 
 #: ../data/ui/smart-dialog.ui.h:2
-msgid "Conveyance"
-msgstr "èé"
+msgid "_Stop Self-test"
+msgstr "åæèææè(_S)"
 
 #: ../data/ui/smart-dialog.ui.h:3
-msgid "Extended"
-msgstr "åäç"
+msgid "Powered On"
+msgstr "èåæ"
 
 #: ../data/ui/smart-dialog.ui.h:4
-msgid "Normalized"
-msgstr "æåå"
+msgid "Updated"
+msgstr "åææ"
 
-#: ../data/ui/smart-dialog.ui.h:5
-msgid "Overall Assessment"
-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/disks/gduatasmartdialog.c:298
+#: ../src/disks/gduatasmartdialog.c:517
+msgid "Temperature"
+msgstr "æå"
 
 #: ../data/ui/smart-dialog.ui.h:6
-msgid "Powered On"
-msgstr "èåæ"
+msgid "Self-test Result"
+msgstr "èææèçæ"
 
 #: ../data/ui/smart-dialog.ui.h:7
 msgid "Self-assessment"
 msgstr "èæèä"
 
 #: ../data/ui/smart-dialog.ui.h:8
-msgid "Self-test Result"
-msgstr "èææèçæ"
+msgid "Overall Assessment"
+msgstr "æéèä"
 
 #: ../data/ui/smart-dialog.ui.h:9
-msgid "Short"
-msgstr "ç"
+msgid "SMART _Attributes"
+msgstr "SM_ART åæ"
 
-#. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
-#. * or the next string for a longer explanation.
-#.
-#: ../data/ui/smart-dialog.ui.h:10 ../src/palimpsest/gduatasmartdialog.c:300
-#: ../src/palimpsest/gduatasmartdialog.c:519
-msgid "Temperature"
-msgstr "æå"
+#. 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:1505
+msgid "Value"
+msgstr "æå"
 
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../data/ui/smart-dialog.ui.h:11 ../src/palimpsest/gduatasmartdialog.c:863
+#: ../data/ui/smart-dialog.ui.h:11
 msgid "Type"
 msgstr "éå"
 
 #: ../data/ui/smart-dialog.ui.h:12
-msgid "Updated"
-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:14 ../src/palimpsest/gduatasmartdialog.c:865
-msgid "Updates"
-msgstr "ææ"
+msgid "Description"
+msgstr "èæ"
 
-#. Translators: This string is used as the column title in the treeview for the value
-#: ../data/ui/smart-dialog.ui.h:15 ../src/palimpsest/gduatasmartdialog.c:1620
-msgid "Value"
-msgstr "æå"
+#: ../data/ui/smart-dialog.ui.h:13
+msgid "Short"
+msgstr "ç"
 
-#: ../data/ui/smart-dialog.ui.h:16
-msgid "_Start Self-test..."
-msgstr "éåèææè(_S)â"
+#: ../data/ui/smart-dialog.ui.h:14
+msgid "Extended"
+msgstr "åäç"
 
-#: ../data/ui/smart-dialog.ui.h:17
-msgid "_Stop Self-test"
-msgstr "åæèææè(_S)"
+#: ../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>"
@@ -725,14 +917,109 @@ msgstr "<big>èåèééåçåè</big>"
 msgid "_Unlock"
 msgstr "èé(_U)"
 
+#: ../src/disk-image-mounter/main.c:96
+msgid "An error occurred"
+msgstr "æéèçç"
+
+#: ../src/disk-image-mounter/main.c:118
+msgid "Allow writing to the image"
+msgstr "åèååæåæ"
+
+#: ../src/disk-image-mounter/main.c:119
+msgid "Wait until created loop devices are cleared"
+msgstr "çååååççèåèçèæéçæ"
+
+#: ../src/disk-image-mounter/main.c:139 ../src/disks/gduutils.c:87
+msgid "All Files"
+msgstr "ææææ"
+
+#: ../src/disk-image-mounter/main.c:143 ../src/disks/gduutils.c:91
+msgid "Disk Images (*.img, *.iso)"
+msgstr "ççæåæ (*.img, *.iso)"
+
+#: ../src/disk-image-mounter/main.c:159
+msgid "Select Disk Image(s) to Mount"
+msgstr "éæèæèçççæåæ"
+
+#: ../src/disk-image-mounter/main.c:163
+msgid "_Mount"
+msgstr "æè(_M)"
+
+#. Add a RO check button that defaults to RO
+#: ../src/disk-image-mounter/main.c:169
+msgid "Set up _read-only mount"
+msgstr "èååèæè(_R)"
+
+#: ../src/disk-image-mounter/main.c:170
+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:213
+#, c-format
+msgid "Error connecting to udisks daemon: %s (%s, %d)"
+msgstr "éçè udisks äæçåæççéèï%s (%s, %d)"
+
+#: ../src/disk-image-mounter/main.c:221
+msgid "Attach and mount one or more disk image files."
+msgstr "éåäæèäæååççæåæã"
+
+#: ../src/disk-image-mounter/main.c:274
+#, c-format
+msgid "Cannot open `%s' - maybe the volume isn't mounted?"
+msgstr "äèéåã%sã- åèæåååææèæèï"
+
+#: ../src/disk-image-mounter/main.c:281
+#, c-format
+msgid "Error opening `%s': %m"
+msgstr "éå ã%sãæççéèï%m"
+
+#: ../src/disk-image-mounter/main.c:302
+#, c-format
+msgid "Error attaching disk image: %s (%s, %d)"
+msgstr "éåççæåææççéèï%s (%s, %d)"
+
+#: ../src/disk-image-mounter/main.c:349
+#, c-format
+msgid "Error mounting filesystem on partition %d of disk image: %s (%s, %d)"
+msgstr "æèççææåæçååå %d çææççæççéèï%s (%s, %d)"
+
+#: ../src/disk-image-mounter/main.c:364
+#, c-format
+msgid ""
+"The file `%s' does not appear to contain a mountable filesystem or partition "
+"table"
+msgstr "ææã%sãääææåååæèçææççæååè"
+
+#: ../src/disk-image-mounter/main.c:375
+#, c-format
+msgid "Error mounting filesystem: %s (%s, %d)"
+msgstr "æèææççæççéèï%s (%s, %d)"
+
+#. this is not fatal but can happen when using FUSE crap where uid 0 is
+#. * not permitted to view files on a FUSE mount
+#.
+#: ../src/disk-image-mounter/main.c:402
+#, c-format
+msgid "Non-fatal error: error setting autoclear to TRUE: %s (%s, %d)\n"
+msgstr "éåééèïéèèåèåæéç TRUEï%s (%s, %d)\n"
+
+#: ../src/disk-image-mounter/main.c:417
+#, c-format
+msgid "Error cleaning up loop device: %s (%s, %d)"
+msgstr "æé loop èçæççéèï%s (%s, %d)"
+
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:143
+#: ../src/disks/gduatasmartdialog.c:141
 msgid "Read Error Rate"
 msgstr "èåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:144
+#: ../src/disks/gduatasmartdialog.c:142
 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"
@@ -743,44 +1030,44 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:153
+#: ../src/disks/gduatasmartdialog.c:151
 msgid "Throughput Performance"
 msgstr "èæåèéæè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:154
+#: ../src/disks/gduatasmartdialog.c:152
 msgid "Average efficiency of the disk"
 msgstr "ççæçååæè"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:161
+#: ../src/disks/gduatasmartdialog.c:159
 msgid "Spinup Time"
 msgstr "ééååæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:162
+#: ../src/disks/gduatasmartdialog.c:160
 msgid "Time needed to spin up the disk"
 msgstr "ååçççäèééæéçæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:169
+#: ../src/disks/gduatasmartdialog.c:167
 msgid "Start/Stop Count"
 msgstr "åå/åæææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:170
+#: ../src/disks/gduatasmartdialog.c:168
 msgid "Number of spindle start/stop cycles"
 msgstr "äèééåå/åæåçæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:177
+#: ../src/disks/gduatasmartdialog.c:175
 msgid "Reallocated Sector Count"
 msgstr "éæåéçåæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:178
+#: ../src/disks/gduatasmartdialog.c:176
 msgid ""
 "Count of remapped sectors. When the hard drive finds a read/write/"
 "verification error, it marks the sector as \"reallocated\" and transfers "
@@ -792,114 +1079,110 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:187
+#: ../src/disks/gduatasmartdialog.c:185
 msgid "Read Channel Margin"
 msgstr "èåéééç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:188
+#: ../src/disks/gduatasmartdialog.c:186
 msgid "Margin of a channel while reading data."
 msgstr "èåèææééçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:195
+#: ../src/disks/gduatasmartdialog.c:193
 msgid "Seek Error Rate"
 msgstr "æåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:196
+#: ../src/disks/gduatasmartdialog.c:194
 msgid "Frequency of errors while positioning"
 msgstr "ååäæççéèçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:203
+#: ../src/disks/gduatasmartdialog.c:201
 msgid "Seek Timer Performance"
 msgstr "æåèæåæè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:204
+#: ../src/disks/gduatasmartdialog.c:202
 msgid "Average efficiency of operations while positioning"
 msgstr "åäææäçååæè"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:211
-#: ../src/palimpsest/gduatasmartdialog.c:536
+#: ../src/disks/gduatasmartdialog.c:209 ../src/disks/gduatasmartdialog.c:534
 msgid "Power-On Hours"
 msgstr "ççééçèåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:212
-#: ../src/palimpsest/gduatasmartdialog.c:537
+#: ../src/disks/gduatasmartdialog.c:210 ../src/disks/gduatasmartdialog.c:535
 msgid "Number of hours elapsed in the power-on state"
 msgstr "éåèæééçæçåææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:219
+#: ../src/disks/gduatasmartdialog.c:217
 msgid "Spinup Retry Count"
 msgstr "éééèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:220
+#: ../src/disks/gduatasmartdialog.c:218
 msgid "Number of retry attempts to spin up"
 msgstr "éæåèååäèééçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:227
+#: ../src/disks/gduatasmartdialog.c:225
 msgid "Calibration Retry Count"
 msgstr "ææéèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:228
+#: ../src/disks/gduatasmartdialog.c:226
 msgid "Number of attempts to calibrate the device"
 msgstr "åèææèççææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:235
+#: ../src/disks/gduatasmartdialog.c:233
 msgid "Power Cycle Count"
 msgstr "éæåçææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:236
+#: ../src/disks/gduatasmartdialog.c:234
 msgid "Number of power-on events"
 msgstr "ååéæääçæç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:243
+#: ../src/disks/gduatasmartdialog.c:241
 msgid "Soft read error rate"
 msgstr "èéèåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:245
-#, fuzzy
-#| msgid "Frequency of 'program' errors while reading from the disk"
+#: ../src/disks/gduatasmartdialog.c:243
 msgid "Frequency of errors while reading from the disk"
-msgstr "åççèåæãçåãççéèçéç"
+msgstr "åççèåæççéèçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:252
+#: ../src/disks/gduatasmartdialog.c:250
 msgid "Reported Uncorrectable Errors"
 msgstr "åååçæææéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:253
+#: ../src/disks/gduatasmartdialog.c:251
 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
+#: ../src/disks/gduatasmartdialog.c:258
 msgid "High Fly Writes"
 msgstr "ééèåå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:261
+#: ../src/disks/gduatasmartdialog.c:259
 msgid ""
 "Number of times a recording head is flying outside its normal operating range"
 msgstr "èåçééèèéæåæäçåæçææ"
@@ -907,73 +1190,70 @@ msgstr "èåçééèèéæåæäçåæçææ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:268
+#: ../src/disks/gduatasmartdialog.c:266
 msgid "Airflow Temperature"
 msgstr "æææå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:269
+#: ../src/disks/gduatasmartdialog.c:267
 msgid "Airflow temperature of the drive"
 msgstr "ççæçæææå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:276
-#: ../src/palimpsest/gduatasmartdialog.c:446
+#: ../src/disks/gduatasmartdialog.c:274 ../src/disks/gduatasmartdialog.c:444
 msgid "G-sense Error Rate"
 msgstr "G-åæåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:277
+#: ../src/disks/gduatasmartdialog.c:275
 msgid "Frequency of mistakes as a result of impact loads"
 msgstr "ççççææéæéèçéç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:284
-#: ../src/palimpsest/gduatasmartdialog.c:503
+#: ../src/disks/gduatasmartdialog.c:282 ../src/disks/gduatasmartdialog.c:501
 msgid "Power-off Retract Count"
 msgstr "æéçéåæææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:285
+#: ../src/disks/gduatasmartdialog.c:283
 msgid "Number of power-off or emergency retract cycles"
 msgstr "éæäææçæåæçéçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:292
-#: ../src/palimpsest/gduatasmartdialog.c:479
+#: ../src/disks/gduatasmartdialog.c:290 ../src/disks/gduatasmartdialog.c:477
 msgid "Load/Unload Cycle Count"
 msgstr "çéèå/èåææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:293
+#: ../src/disks/gduatasmartdialog.c:291
 msgid "Number of cycles into landing zone position"
 msgstr "çééååæåäççææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:301
+#: ../src/disks/gduatasmartdialog.c:299
 msgid "Current internal temperature of the drive"
 msgstr "ççæçåçåéæå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:308
+#: ../src/disks/gduatasmartdialog.c:306
 msgid "Hardware ECC Recovered"
 msgstr "çé ECC åå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:309
+#: ../src/disks/gduatasmartdialog.c:307
 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
+#: ../src/disks/gduatasmartdialog.c:314
 msgid "Reallocation Count"
 msgstr "éæåéææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:317
+#: ../src/disks/gduatasmartdialog.c:315
 msgid ""
 "Number of remapping operations. The raw value of this attribute shows the "
 "total number of (successful and unsuccessful) attempts to transfer data from "
@@ -985,11 +1265,11 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:327
+#: ../src/disks/gduatasmartdialog.c:325
 msgid "Current Pending Sector Count"
 msgstr "çåæççåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:328
+#: ../src/disks/gduatasmartdialog.c:326
 msgid ""
 "Number of sectors waiting to be remapped. If the sector waiting to be "
 "remapped is subsequently written or read successfully, this value is "
@@ -1003,11 +1283,11 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:339
+#: ../src/disks/gduatasmartdialog.c:337
 msgid "Uncorrectable Sector Count"
 msgstr "çæäæçåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:340
+#: ../src/disks/gduatasmartdialog.c:338
 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 "
@@ -1019,22 +1299,22 @@ msgstr ""
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:349
+#: ../src/disks/gduatasmartdialog.c:347
 msgid "UDMA CRC Error Rate"
 msgstr "UDMA CRC éèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:350
+#: ../src/disks/gduatasmartdialog.c:348
 msgid "Number of CRC errors during UDMA mode"
 msgstr "å UDMA æåäç CRC éèæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:357
+#: ../src/disks/gduatasmartdialog.c:355
 msgid "Write Error Rate"
 msgstr "ååéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:358
+#: ../src/disks/gduatasmartdialog.c:356
 msgid ""
 "Number of errors while writing to disk (or) multi-zone error rate (or) "
 "flying-height"
@@ -1043,90 +1323,90 @@ msgstr "ååçç(æ)åéååéé(æ)éèéåçéèæ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:365
+#: ../src/disks/gduatasmartdialog.c:363
 msgid "Soft Read Error Rate"
 msgstr "èéèåéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:366
+#: ../src/disks/gduatasmartdialog.c:364
 msgid "Number of off-track errors"
 msgstr "èèéèçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:373
+#: ../src/disks/gduatasmartdialog.c:371
 msgid "Data Address Mark Errors"
 msgstr "èæäåæèéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:374
+#: ../src/disks/gduatasmartdialog.c:372
 msgid "Number of Data Address Mark (DAM) errors (or) vendor-specific"
 msgstr "èæäåæè(DAM)(æ)ååæåçéèæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:381
+#: ../src/disks/gduatasmartdialog.c:379
 msgid "Run Out Cancel"
 msgstr "åççåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:382
+#: ../src/disks/gduatasmartdialog.c:380
 msgid "Number of ECC errors"
 msgstr "ECC éèçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:389
+#: ../src/disks/gduatasmartdialog.c:387
 msgid "Soft ECC correction"
 msgstr "èé ECC äæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:390
+#: ../src/disks/gduatasmartdialog.c:388
 msgid "Number of errors corrected by software ECC"
 msgstr "èé ECC äæçéèæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:397
+#: ../src/disks/gduatasmartdialog.c:395
 msgid "Thermal Asperity Rate"
 msgstr "æåéééç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:398
+#: ../src/disks/gduatasmartdialog.c:396
 msgid "Number of Thermal Asperity Rate errors"
 msgstr "æåéééçéèçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:405
+#: ../src/disks/gduatasmartdialog.c:403
 msgid "Flying Height"
 msgstr "éèéå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:406
+#: ../src/disks/gduatasmartdialog.c:404
 msgid "Height of heads above the disk surface"
 msgstr "çéèéççèéçéå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:413
+#: ../src/disks/gduatasmartdialog.c:411
 #, fuzzy
 msgid "Spin High Current"
 msgstr "èåçåççååç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:414
+#: ../src/disks/gduatasmartdialog.c:412
 msgid "Amount of high current used to spin up the drive"
 msgstr ""
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:421
+#: ../src/disks/gduatasmartdialog.c:419
 #, fuzzy
 msgid "Spin Buzz"
 msgstr "åèæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:422
+#: ../src/disks/gduatasmartdialog.c:420
 #, fuzzy
 msgid "Number of buzz routines to spin up the drive"
 msgstr "éæåèååäèééçæéã"
@@ -1134,28 +1414,28 @@ msgstr "éæåèååäèééçæéã"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:429
+#: ../src/disks/gduatasmartdialog.c:427
 msgid "Offline Seek Performance"
 msgstr "éçæåæè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:430
+#: ../src/disks/gduatasmartdialog.c:428
 msgid "Drive's seek performance during offline operations"
 msgstr "åéçæääçççææåæè"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:437
+#: ../src/disks/gduatasmartdialog.c:435
 msgid "Disk Shift"
 msgstr "çççä"
 
-#: ../src/palimpsest/gduatasmartdialog.c:438
+#: ../src/disks/gduatasmartdialog.c:436
 msgid ""
 "Shift of disk is possible as a result of strong shock loading in the store, "
 "as a result of falling (or) temperature"
 msgstr "ççççäåèæåçåèåæéååçææïçææè(æ)æåçåçéæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:447
+#: ../src/disks/gduatasmartdialog.c:445
 msgid ""
 "Number of errors as a result of impact loads as detected by a shock sensor"
 msgstr "çææåæååæåçææèåæççéèçææ"
@@ -1163,22 +1443,22 @@ msgstr "çææåæååæåçææèåæççéèçææ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:454
+#: ../src/disks/gduatasmartdialog.c:452
 msgid "Loaded Hours"
 msgstr "èåçåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:455
+#: ../src/disks/gduatasmartdialog.c:453
 msgid "Number of hours in general operational state"
 msgstr "äèåæäçæçåææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:462
+#: ../src/disks/gduatasmartdialog.c:460
 msgid "Load/Unload Retry Count"
 msgstr "èå/èåéèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:463
+#: ../src/disks/gduatasmartdialog.c:461
 msgid ""
 "Loading on drive caused by numerous recurrences of operations, like reading, "
 "recording, positioning of heads, etc"
@@ -1187,67 +1467,67 @@ msgstr "çæäçåçåçéæçççèåïåæèåãèéã
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:471
+#: ../src/disks/gduatasmartdialog.c:469
 msgid "Load Friction"
 msgstr "èèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:472
+#: ../src/disks/gduatasmartdialog.c:470
 msgid "Load on drive caused by friction in mechanical parts of the store"
 msgstr "ååèçææéåææéæççæäçéå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:480
+#: ../src/disks/gduatasmartdialog.c:478
 msgid "Total number of load cycles"
 msgstr "èèåçæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:487
+#: ../src/disks/gduatasmartdialog.c:485
 msgid "Load-in Time"
 msgstr "çéååæé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:488
+#: ../src/disks/gduatasmartdialog.c:486
 msgid "General time for loading in a drive"
 msgstr "èåçççäèæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:495
+#: ../src/disks/gduatasmartdialog.c:493
 msgid "Torque Amplification Count"
 msgstr "æèååçæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:496
+#: ../src/disks/gduatasmartdialog.c:494
 msgid "Quantity efforts of the rotating moment of a drive"
 msgstr ""
 
-#: ../src/palimpsest/gduatasmartdialog.c:504
+#: ../src/disks/gduatasmartdialog.c:502
 msgid "Number of power-off retract events"
 msgstr "éæäææçæåæçéçææ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:511
+#: ../src/disks/gduatasmartdialog.c:509
 msgid "GMR Head Amplitude"
 msgstr "GMR çéæå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:512
+#: ../src/disks/gduatasmartdialog.c:510
 msgid "Amplitude of heads trembling (GMR-head) in running mode"
 msgstr "ååèæåäçéæåïGMR-çéïçæå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:520
+#: ../src/disks/gduatasmartdialog.c:518
 msgid "Temperature of the drive"
 msgstr "éåççæçæå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:527
+#: ../src/disks/gduatasmartdialog.c:525
 msgid "Endurance Remaining"
 msgstr "åéèäå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:528
+#: ../src/disks/gduatasmartdialog.c:526
 msgid ""
 "Number of physical erase cycles completed on the drive as a percentage of "
 "the maximum physical erase cycles the drive supports"
@@ -1256,22 +1536,22 @@ msgstr "äçåæèçççæåéæåççæéåçèçååå
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:544
+#: ../src/disks/gduatasmartdialog.c:542
 msgid "Uncorrectable ECC Count"
 msgstr "çæææç ECC ææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:545
+#: ../src/disks/gduatasmartdialog.c:543
 msgid "Number of uncorrectable ECC errors"
 msgstr "çæææç ECC éèçæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:552
+#: ../src/disks/gduatasmartdialog.c:550
 msgid "Good Block Rate"
 msgstr "èåååç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:553
+#: ../src/disks/gduatasmartdialog.c:551
 msgid ""
 "Number of available reserved blocks as a percentage of the total number of "
 "reserved blocks"
@@ -1280,88 +1560,45 @@ msgstr "åççäçååæäåéäçååæççåæ"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:561
+#: ../src/disks/gduatasmartdialog.c:559
 msgid "Head Flying Hours"
 msgstr "çééèåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:562
+#: ../src/disks/gduatasmartdialog.c:560
 msgid "Time while head is positioning"
 msgstr "çéåäçæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:569
+#: ../src/disks/gduatasmartdialog.c:567
 msgid "Read Error Retry Rate"
 msgstr "èåéèéèç"
 
-#: ../src/palimpsest/gduatasmartdialog.c:570
+#: ../src/disks/gduatasmartdialog.c:568
 msgid "Number of errors while reading from a disk"
 msgstr "åççèåæççéèææ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:630
-#: ../src/palimpsest/gduatasmartdialog.c:820
+#: ../src/disks/gduatasmartdialog.c:628
 #, c-format
 msgid "No description for attribute %d"
 msgstr "ææåæ %d çæè"
 
 #. Translators: Shown in the treeview for a failing attribute
-#: ../src/palimpsest/gduatasmartdialog.c:681
+#: ../src/disks/gduatasmartdialog.c:679
 msgid "FAILING"
 msgstr "åæ"
 
 #. Translators: Shown in the treeview for an attribute that failed in the past
-#: ../src/palimpsest/gduatasmartdialog.c:690
+#: ../src/disks/gduatasmartdialog.c:688
 msgid "Failed in the past"
 msgstr "éåçéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:694
+#: ../src/disks/gduatasmartdialog.c:692
 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 å"
-
-#. 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 å"
-
-#. 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 åæ"
-
-#. 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 åé"
-
-#. 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 çé"
-
-#. 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 åç"
-
-#: ../src/palimpsest/gduatasmartdialog.c:764
+#: ../src/disks/gduatasmartdialog.c:719
 #, c-format
 msgid "%d sector"
 msgid_plural "%d sectors"
@@ -1374,8 +1611,7 @@ msgstr[0] "%d çå"
 #. * The first %f is the temperature in degrees Celcius and
 #. * the second %f is the temperature in degrees Fahrenheit.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:776
-#: ../src/palimpsest/gduatasmartdialog.c:1058
+#: ../src/disks/gduatasmartdialog.c:731 ../src/disks/gduatasmartdialog.c:943
 #, c-format
 msgid "%.0f C / %.0f F"
 msgstr "%.0f C / %.0f F"
@@ -1383,57 +1619,25 @@ 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
+#: ../src/disks/gduatasmartdialog.c:742
 msgid "N/A"
 msgstr "N/A"
 
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Pre-Fail)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:831
-msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
-msgstr "åçåææ 24 åæåååççççææçåå (éåççéè)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Old-Age)" in English
-#.
-#: ../src/palimpsest/gduatasmartdialog.c:838
-msgid ""
-"Failure is a sign the disk exceeded its intended design life period (Old-Age)"
-msgstr "åçåææççæåèéåèèçäçåé (èå)"
-
-#. 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 "ææèæéææé (äç)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Not Online)" in English
+#. Translators: The first %s is the pretty value (such as '300
+#. * sectors' or '2.5 years' or '53Â C / 127Â F').
+#. *
+#. * The three %d are the normalized, threshold and worst values -
+#. * these are all decimal numbers.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:853
-msgid "Only during off-line activities (Not Online)"
-msgstr "ååéçæåæéïéäççæï"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:861
-msgid "Name"
-msgstr "åç"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../src/palimpsest/gduatasmartdialog.c:867
-msgid "Description"
-msgstr "èæ"
-
-#: ../src/palimpsest/gduatasmartdialog.c:908
+#: ../src/disks/gduatasmartdialog.c:788
 #, c-format
-msgid "%d <span size=\"small\">(Worst:%d, Threshold: %d)</span>"
-msgstr "%d <span size=\"small\">(æåï%dïçéï%d)</span>"
+msgid ""
+"%s <span size=\"small\">(Normalized: %d, Threshold: %d, Worst: %d)</span>"
+msgstr "%s <span size=\"small\">(äèåï%dïçéï%dïæåï%d)</span>"
 
 #. Translators: Please keep "(Pre-Fail)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:918
+#: ../src/disks/gduatasmartdialog.c:798
 msgid ""
 "Failure is a sign the disk will fail within 24 hours <span size=\"small\">"
 "(Pre-Fail)</span>"
@@ -1443,7 +1647,7 @@ msgstr ""
 
 #. Translators: Please keep "(Old-Age)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:924
+#: ../src/disks/gduatasmartdialog.c:804
 msgid ""
 "Failure is a sign the disk exceeded its intended design life period <span "
 "size=\"small\">(Old-Age)</span>"
@@ -1452,191 +1656,350 @@ msgstr ""
 
 #. Translators: Please keep "(Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:931
-msgid "Every time data is collected <span size=\"small\">(Online)</span>"
-msgstr "ææèæéææé <span size=\"small\">(äç)</span>"
+#: ../src/disks/gduatasmartdialog.c:811
+msgid ""
+"Updated every time data is collected <span size=\"small\">(Online)</span>"
+msgstr "æææéèæ <span size=\"small\">(Online)</span> æææ"
 
 #. Translators: Please keep "(Not Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:937
+#: ../src/disks/gduatasmartdialog.c:817
 msgid ""
-"Only during off-line activities <span size=\"small\">(Not Online)</span>"
-msgstr "ååéçæåæé <span size=\"small\">(éäççæ)</span>"
+"Updated only during off-line activities <span size=\"small\">(Not Online)</"
+"span>"
+msgstr "ååéçæåæé <span size=\"small\">(Not Online)</span>"
 
-#: ../src/palimpsest/gduatasmartdialog.c:964
+#: ../src/disks/gduatasmartdialog.c:848
 msgctxt "smart-self-test-result"
 msgid "Last self-test completed successfully"
 msgstr "äææååæçèææè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:968
+#: ../src/disks/gduatasmartdialog.c:852
 msgctxt "smart-self-test-result"
 msgid "Last self-test was aborted"
 msgstr "äæçèææèåäæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:972
+#: ../src/disks/gduatasmartdialog.c:856
 msgctxt "smart-self-test-result"
 msgid "Last self-test was interrupted"
 msgstr "äæçèææèåäæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:976
+#: ../src/disks/gduatasmartdialog.c:860
 msgctxt "smart-self-test-result"
 msgid "Last self-test did not complete"
 msgstr "äæçèææèæåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:980
+#: ../src/disks/gduatasmartdialog.c:864
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed"
 msgstr "äæèææèåæ"
 
 #. Translators: shown when the last self-test failed and the problem is with the electrical subsystem
-#: ../src/palimpsest/gduatasmartdialog.c:985
+#: ../src/disks/gduatasmartdialog.c:869
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (electrical)"
 msgstr "äæçèææèåæ (éåæé)"
 
 #. Translators: shown when the last self-test failed and the problem is with the servo subsystem - see http://en.wikipedia.org/wiki/Servomechanism
-#: ../src/palimpsest/gduatasmartdialog.c:990
+#: ../src/disks/gduatasmartdialog.c:874
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (servo)"
-msgstr ""
+msgstr "äæèææèåæ (servo)"
 
 #. Translators: shown when the last self-test failed and the problem is with the reading subsystem -
-#: ../src/palimpsest/gduatasmartdialog.c:995
+#: ../src/disks/gduatasmartdialog.c:879
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (read)"
-msgstr ""
+msgstr "äæèææèåæ (read)"
 
 #. Translators: shown when the last self-test failed and the disk is suspected of having handling damage (e.g. physical damage to the hard disk)
-#: ../src/palimpsest/gduatasmartdialog.c:1000
+#: ../src/disks/gduatasmartdialog.c:884
 msgctxt "smart-self-test-result"
 msgid "Last self-test failed (handling)"
 msgstr "äæçèææèåæ (èç)"
 
 #. Translators: shown when a self-test is in progress. The first %d is the percentage of the test remaining.
-#: ../src/palimpsest/gduatasmartdialog.c:1005
+#: ../src/disks/gduatasmartdialog.c:889
 #, c-format
 msgctxt "smart-self-test-result"
 msgid "Self-test in progress â %d%% remaining"
 msgstr "èææèéèä - åä %d%%"
 
 #. Translators: Shown when a self-test is not unknown. The %s is the result-code from the API code.
-#: ../src/palimpsest/gduatasmartdialog.c:1012
+#: ../src/disks/gduatasmartdialog.c:896
 #, c-format
 msgctxt "smart-self-test-result"
 msgid "Unknown (%s)"
 msgstr "äæ (%s)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1034
+#: ../src/disks/gduatasmartdialog.c:919
 #, c-format
 msgid "%s ago"
 msgstr "%så"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1091
+#: ../src/disks/gduatasmartdialog.c:977
 msgid "SMART is not supported"
 msgstr "äææ SMART"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1097
+#: ../src/disks/gduatasmartdialog.c:983
 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:995
+msgid "Self-test in progress"
+msgstr "æåéèèææè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1123
-#: ../src/palimpsest/gduatasmartdialog.c:1132
+#: ../src/disks/gduatasmartdialog.c:1008 ../src/disks/gduatasmartdialog.c:1017
 msgid "DISK IS LIKELY TO FAIL SOON"
 msgstr "ççæääåååæåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1155
+#: ../src/disks/gduatasmartdialog.c:1040
 msgid "SELF-TEST FAILED"
 msgstr "èææèåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1164
+#: ../src/disks/gduatasmartdialog.c:1049
 #, c-format
 msgid "Disk is OK, one failing attribute is failing"
 msgid_plural "Disk is OK, %d attributes are failing"
 msgstr[0] "ççææåï%d åææåé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1175
+#: ../src/disks/gduatasmartdialog.c:1060
 #, c-format
 msgid "Disk is OK, one bad sector"
 msgid_plural "Disk is OK, %d bad sectors"
 msgstr[0] "ççæèåï%d åæåççå"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1186
+#: ../src/disks/gduatasmartdialog.c:1071
 #, 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 ååæéåæåé"
 
+#. Otherwise, it's all honky dory
+#: ../src/disks/gduatasmartdialog.c:1080
+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/palimpsest/gduatasmartdialog.c:1209
+#: ../src/disks/gduatasmartdialog.c:1094
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1364
+#: ../src/disks/gduatasmartdialog.c:1249
 msgid "Threshold exceeded"
 msgstr "èéçé"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1369
+#: ../src/disks/gduatasmartdialog.c:1254
 msgid "Threshold not exceeded"
 msgstr "åæèéçé"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1428
+#: ../src/disks/gduatasmartdialog.c:1313
 msgid "Error refreshing SMART data"
 msgstr "ææ SMART èææççéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1460
+#: ../src/disks/gduatasmartdialog.c:1345
 msgid "Error aborting SMART self-test"
 msgstr "äæ SMART èææèæççéè"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1479
+#: ../src/disks/gduatasmartdialog.c:1364
 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
+#: ../src/disks/gduatasmartdialog.c:1479
 msgid "ID"
 msgstr "ID"
 
 #. Translators: This string is used as the column title in the treeview for the attribute name and description
-#: ../src/palimpsest/gduatasmartdialog.c:1606
+#: ../src/disks/gduatasmartdialog.c:1491
 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:341
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%d MB/s"
+msgstr "%d MB/s"
+
+#. Translators: This is used in the benchmark graph - %g is number of milliseconds
+#: ../src/disks/gdubenchmarkdialog.c:346
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%3g ms"
+msgstr "%3g ms"
+
+#. Translators: %s is the formatted size, e.g. "42 MB" and the trailing "/s" means per second
+#: ../src/disks/gdubenchmarkdialog.c:654
+#, c-format
+msgctxt "benchmark-transfer-rate"
+msgid "%s/s"
+msgstr "%s/s"
+
+#: ../src/disks/gdubenchmarkdialog.c:669 ../src/disks/gdubenchmarkdialog.c:968
+#, c-format
+msgid "%d sample"
+msgid_plural "%d samples"
+msgstr[0] "%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:710
+#, c-format
+msgctxt "benchmark-updated"
+msgid "%s (%s ago)"
+msgstr "%s (%s å)"
+
+#: ../src/disks/gdubenchmarkdialog.c:722
+msgctxt "benchmark-updated"
+msgid "No benchmark data available"
+msgstr "ææåççæèèæèæ"
+
+#: ../src/disks/gdubenchmarkdialog.c:727
+msgctxt "benchmark-updated"
+msgid "Opening Device..."
+msgstr "éåèçâ"
+
+#: ../src/disks/gdubenchmarkdialog.c:731
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring transfer rate (%2.1f%% complete)..."
+msgstr "æéåèç (ååæ %2.1f%%)â"
+
+#: ../src/disks/gdubenchmarkdialog.c:738
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring access time (%2.1f%% complete)..."
+msgstr "æéååæé (ååæ %2.1f%%)â"
+
+#: ../src/disks/gdubenchmarkdialog.c:854
+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:890
+#, 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:900
+#, 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:966
+#, c-format
+msgctxt "benchmark-access-time"
+msgid "%.2f msec"
+msgstr "%.2f æç"
+
+#: ../src/disks/gdubenchmarkdialog.c:1278
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting size of device: %m"
+msgstr "ååèçååæççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1288
+#, c-format
+msgctxt "benchmarking"
+msgid "Error getting page size: %m\n"
+msgstr "åååéååæççéèï%m\n"
+
+#: ../src/disks/gdubenchmarkdialog.c:1321
+#: ../src/disks/gdubenchmarkdialog.c:1340
+#: ../src/disks/gdubenchmarkdialog.c:1376
+#: ../src/disks/gdubenchmarkdialog.c:1395
+#, c-format
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld"
+msgstr "æååçé %lld æççéè"
+
+#: ../src/disks/gdubenchmarkdialog.c:1330
+#: ../src/disks/gdubenchmarkdialog.c:1385
+#, c-format
+msgctxt "benchmarking"
+msgid "Error pre-reading %lld bytes from offset %lld"
+msgstr "ååçé %2$lld éè %1$lld äåçæççéè"
+
+#: ../src/disks/gdubenchmarkdialog.c:1351
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %d MB from offset %lld"
+msgstr "ååçé %2$lld èå %1$d MB æççéè"
+
+#: ../src/disks/gdubenchmarkdialog.c:1406
+#, c-format
+msgctxt "benchmarking"
+msgid "Error writing %lld bytes at offset %lld: %m"
+msgstr "åå %lld äåçæèå %lld æççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1416
+#, c-format
+msgctxt "benchmarking"
+msgid "Expected to write %lld bytes, only wrote %lld: %m"
+msgstr "éæåå %lld äåçïååå %lldï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1426
+#, c-format
+msgctxt "benchmarking"
+msgid "Error syncing (at offset %lld): %m"
+msgstr "åæ (æåçé %lld) æççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1466
+#, c-format
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld: %m"
+msgstr "æååçé %lld æççéèï%m"
+
+#: ../src/disks/gdubenchmarkdialog.c:1478
+#, c-format
+msgctxt "benchmarking"
+msgid "Error reading %lld bytes from offset %lld"
+msgstr "ååçé %2$lld èå %1$lld äåçæççéè"
+
+#: ../src/disks/gduchangepassphrasedialog.c:171
 msgid "Error updating /etc/crypttab"
 msgstr "åææ /etc/crypttab æççéè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:190
+#: ../src/disks/gduchangepassphrasedialog.c:190
 msgid "Error changing passphrase"
 msgstr "æèåèæççéè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:277
-#: ../src/palimpsest/gducrypttabdialog.c:424
+#: ../src/disks/gduchangepassphrasedialog.c:277
+#: ../src/disks/gducrypttabdialog.c:422
 msgid "Error retrieving configuration data"
 msgstr "ååçæèææççéè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:303
+#: ../src/disks/gduchangepassphrasedialog.c:303
 msgid "/etc/crypttab configuration data is malformed"
 msgstr "/etc/crypttab çæèæçæåäè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:336
+#: ../src/disks/gduchangepassphrasedialog.c:336
 msgid ""
 "Changing the passphrase for this device, will also update the passphrase "
 "referenced by the <i>/etc/crypttab</i> file"
 msgstr "æèéåèççåèïååæææ <i>/etc/crypttab</i> ææäåççåè"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:355
-#: ../src/palimpsest/gducreatefilesystemwidget.c:503
+#: ../src/disks/gduchangepassphrasedialog.c:355
+#: ../src/disks/gducreatefilesystemwidget.c:550
 msgid "The strength of the passphrase"
 msgstr "åèçåå"
 
@@ -1644,154 +2007,171 @@ msgstr "åèçåå"
 #. *              The first %s is a name for the disk (e.g. 'sdb').
 #. *              The second %s is today's date and time, e.g. "March 2, 1976 6:25AM".
 #.
-#: ../src/palimpsest/gducreatediskimagedialog.c:196
+#: ../src/disks/gducreatediskimagedialog.c:196
 #, c-format
 msgid "Disk Image of %s (%s).img"
 msgstr "ççæåæ %s (%s).img"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:233
-#: ../src/palimpsest/gdurestorediskimagedialog.c:274
+#: ../src/disks/gducreatediskimagedialog.c:233
+#: ../src/disks/gdurestorediskimagedialog.c:274
 msgid "Error writing to backup image"
 msgstr "åååäæåææççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:313
-#: ../src/palimpsest/gdurestorediskimagedialog.c:353
-#, fuzzy
+#: ../src/disks/gducreatediskimagedialog.c:314
+#: ../src/disks/gdurestorediskimagedialog.c:354
 msgid "Error reading from offset %"
-msgstr "åææèåæççéèï%s"
+msgstr "ååçé % èåæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:381
-#: ../src/palimpsest/gdurestorediskimagedialog.c:541
+#: ../src/disks/gducreatediskimagedialog.c:382
+#: ../src/disks/gdurestorediskimagedialog.c:542
 msgid "Error opening device"
 msgstr "éåèçæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:396
-#: ../src/palimpsest/gdurestorediskimagedialog.c:557
+#: ../src/disks/gducreatediskimagedialog.c:397
+#: ../src/disks/gdurestorediskimagedialog.c:558
 msgid "Error determining size of device"
 msgstr "çåèçåéæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:446
+#: ../src/disks/gducreatediskimagedialog.c:447
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr "åçã%sãçææåååãæåèåäåï"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:449
+#: ../src/disks/gducreatediskimagedialog.c:450
 #, 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:454
 msgid "_Replace"
 msgstr "åä(_R)"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:495
+#: ../src/disks/gducreatediskimagedialog.c:496
 msgid "Error opening file for writing"
 msgstr "éåææäååæççéè"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:564
+#: ../src/disks/gducreatediskimagedialog.c:565
 #, c-format
 msgid "Copying data from device <i>%s</i>..."
 msgstr "æååèç <i>%s</i> äèèèæâ"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:388
-#: ../src/palimpsest/gduformatdiskdialog.c:130
+#: ../src/disks/gducreatefilesystemwidget.c:392
+#: ../src/disks/gduformatdiskdialog.c:268
 msgid "Compatible with all systems and devices"
 msgstr "çåæææçççèèç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:389
+#: ../src/disks/gducreatefilesystemwidget.c:393
 msgid "FAT"
 msgstr "FAT"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:394
+#: ../src/disks/gducreatefilesystemwidget.c:398
 msgid "Compatible with most systems"
 msgstr "çåæåæçç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:395
+#: ../src/disks/gducreatefilesystemwidget.c:399
 msgid "NTFS"
 msgstr "NTFS"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:400
+#: ../src/disks/gducreatefilesystemwidget.c:404
 msgid "Compatible with Linux systems"
 msgstr "çåæ Linux çç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:401
+#: ../src/disks/gducreatefilesystemwidget.c:405
 msgid "Ext4"
 msgstr "Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:406
+#: ../src/disks/gducreatefilesystemwidget.c:410
 msgid "Encrypted, compatible with Linux systems"
 msgstr "åååïçåæ Linux çç"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:407
+#: ../src/disks/gducreatefilesystemwidget.c:411
 msgid "LUKS + Ext4"
 msgstr "LUKS + Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:412
+#: ../src/disks/gducreatefilesystemwidget.c:416
 msgid "Custom"
 msgstr "èè"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:413
+#: ../src/disks/gducreatefilesystemwidget.c:417
 msgid "Enter filesystem type"
 msgstr "èåææççéå"
 
 #. Translators: this is the default name for the filesystem
-#: ../src/palimpsest/gducreatefilesystemwidget.c:456
+#: ../src/disks/gducreatefilesystemwidget.c:460
 msgid "New Volume"
 msgstr "æååå"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:215
+#: ../src/disks/gducreatefilesystemwidget.c:499
+#: ../src/disks/gduformatdiskdialog.c:165
+msgid "Don't overwrite existing data"
+msgstr "äèèååååçèæ"
+
+#: ../src/disks/gducreatefilesystemwidget.c:500
+#: ../src/disks/gduformatdiskdialog.c:166
+msgid "Quick"
+msgstr "åé"
+
+#: ../src/disks/gducreatefilesystemwidget.c:507
+#: ../src/disks/gduformatdiskdialog.c:176
+msgid "Overwrite existing data with zeroes"
+msgstr "äéèåæåçèæ"
+
+#: ../src/disks/gducreatefilesystemwidget.c:508
+#: ../src/disks/gduformatdiskdialog.c:177
+msgid "Slow"
+msgstr "æé"
+
+#: ../src/disks/gducreatepartitiondialog.c:215
 msgid "Error formatting partition"
 msgstr "æåååååæççéè"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:242
+#: ../src/disks/gducreatepartitiondialog.c:243
 msgid "Error creating partition"
 msgstr "åçåååæççéè"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:326
+#: ../src/disks/gducreatepartitiondialog.c:331
 msgid "Extended partition"
 msgstr "åäååå"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:327
+#: ../src/disks/gducreatepartitiondialog.c:332
 msgid "For logical partitions"
 msgstr "çæéèååå"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:340
+#: ../src/disks/gducreatepartitiondialog.c:345
 msgid ""
 "Cannot create a new partition. There are already four primary partitions."
 msgstr "äèåçæçåååãåçæååäèåååã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:344
+#: ../src/disks/gducreatepartitiondialog.c:349
 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:122 ../src/disks/gducrypttabdialog.c:142
 msgid "Will be created"
 msgstr "åæåç"
 
-#: ../src/palimpsest/gducrypttabdialog.c:124
-#: ../src/palimpsest/gducrypttabdialog.c:149
+#: ../src/disks/gducrypttabdialog.c:124 ../src/disks/gducrypttabdialog.c:149
 msgid "None"
 msgstr "ææ"
 
-#: ../src/palimpsest/gducrypttabdialog.c:151
+#: ../src/disks/gducrypttabdialog.c:151
 msgid "Will be deleted"
 msgstr "æèåé"
 
-#: ../src/palimpsest/gducrypttabdialog.c:278
+#: ../src/disks/gducrypttabdialog.c:277
 msgid "Error removing /etc/crypttab entry"
 msgstr "çé /etc/crypttab éçæççéè"
 
-#: ../src/palimpsest/gducrypttabdialog.c:363
+#: ../src/disks/gducrypttabdialog.c:361
 msgid "Error adding /etc/crypttab entry"
 msgstr "åå /etc/crypttab éçæççéè"
 
-#: ../src/palimpsest/gducrypttabdialog.c:386
+#: ../src/disks/gducrypttabdialog.c:384
 msgid "Error updating /etc/crypttab entry"
 msgstr "åææ /etc/crypttab éçæççéè"
 
-#: ../src/palimpsest/gducrypttabdialog.c:509
+#: ../src/disks/gducrypttabdialog.c:507
 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>"
@@ -1799,16 +2179,16 @@ msgstr ""
 "åæå <i>/etc/crypttab</i> ææåççåèææèãèæèççæäçåèïäç "
 "<i>æèåèâ</i>"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:410
+#: ../src/disks/gdudevicetreemodel.c:498
 msgid "Disk Drives"
 msgstr "ççæ"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:820
+#: ../src/disks/gdudevicetreemodel.c:907
 msgid "Other Devices"
 msgstr "åäèç"
 
 #. Translators: This is for a /dev/loop device - %s is the size of the device e.g. "230 MB".
-#: ../src/palimpsest/gdudevicetreemodel.c:925
+#: ../src/disks/gdudevicetreemodel.c:1012
 #, c-format
 msgid "%s Loop Device"
 msgstr "%s Loop èç"
@@ -1816,216 +2196,454 @@ msgstr "%s Loop èç"
 #. Translators: This is for a block device which we failed to categorize  - %s is
 #. * the size of the device e.g. "230 MB".
 #.
-#: ../src/palimpsest/gdudevicetreemodel.c:946
+#: ../src/disks/gdudevicetreemodel.c:1033
 #, c-format
 msgid "%s Block Device"
 msgstr "%s ååèç"
 
-#: ../src/palimpsest/gdufilesystemdialog.c:74
+#: ../src/disks/gdudisksettingsdialog.c:278
+msgctxt "standby-value"
+msgid "Never"
+msgstr "æä"
+
+#: ../src/disks/gdudisksettingsdialog.c:297
+msgctxt "standby-value"
+msgid "Vendor-defined"
+msgstr "åååç"
+
+#: ../src/disks/gdudisksettingsdialog.c:301
+msgctxt "standby-value"
+msgid "Reserved"
+msgstr "åäç"
+
+#: ../src/disks/gdudisksettingsdialog.c:322
+msgctxt "apm-level"
+msgid "255 (Disabled)"
+msgstr "255 (ååç)"
+
+#: ../src/disks/gdudisksettingsdialog.c:326
+#, fuzzy, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down permitted)"
+msgstr "åäæè"
+
+#: ../src/disks/gdudisksettingsdialog.c:330
+#, fuzzy, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down not permitted)"
+msgstr "äåèçååç"
+
+#: ../src/disks/gdudisksettingsdialog.c:345
+msgctxt "aam-level"
+msgid "0 (Disabled)"
+msgstr "0 (ååç)"
+
+#: ../src/disks/gdudisksettingsdialog.c:374
+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:404
+msgid "Never"
+msgstr "æä"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:406
+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:408
+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:410
+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:412
+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:416
+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:418
+msgid "â Spindown"
+msgstr ""
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:420
+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:424
+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:426
+msgid "Loud (Fast)"
+msgstr "åé (åé)"
+
+#: ../src/disks/gdufilesystemdialog.c:74
 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:119
+#, 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:130
+#, c-format
+msgid "Approximately %s"
+msgstr "åç %s"
+
+#: ../src/disks/gduformatdiskdialog.c:209
+msgid "ATA Secure Erase"
+msgstr "ATA ååæé"
+
+#: ../src/disks/gduformatdiskdialog.c:224
+msgid "ATA Enhanced Secure Erase"
+msgstr "ATA ååååæé"
+
+#: ../src/disks/gduformatdiskdialog.c:269
 msgid "MBR / DOS"
 msgstr "MBR / DOS"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:138
+#: ../src/disks/gduformatdiskdialog.c:279
 msgid "Compatible with modern systems and hard disks > 2TB"
 msgstr "çåæçäçççèçç > 2TB"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:139
+#: ../src/disks/gduformatdiskdialog.c:280
 msgid "GPT"
 msgstr "GPT"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:151
+#: ../src/disks/gduformatdiskdialog.c:297
 msgid "No partitioning"
 msgstr "ææååå"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:152
+#: ../src/disks/gduformatdiskdialog.c:298
 msgid "Empty"
 msgstr "çç"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:186
+#: ../src/disks/gduformatdiskdialog.c:342
 msgid "Error formatting disk"
 msgstr "æååççæççéè"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:231
+#: ../src/disks/gduformatdiskdialog.c:399
 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:403
+msgid ""
+"All data on the disk will be lost but may still be recoverable by data "
+"recovery services"
+msgstr "ççäææçèæåææåïäæåèäçåääçèæååæåäéå"
+
+#: ../src/disks/gduformatdiskdialog.c:405
+#: ../src/disks/gduformatvolumedialog.c:167
+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:410
+msgid ""
+"All data on the disk will be overwritten and will likely not be recoverable "
+"by data recovery services"
+msgstr "ççäææçèæåæèèåïèäåèçæäçèæååæåäéå"
+
+#: ../src/disks/gduformatdiskdialog.c:418
+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 Secure Erase</a> çæçääçèæäèåéé"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:233
-#: ../src/palimpsest/gduformatvolumedialog.c:159
+#: ../src/disks/gduformatdiskdialog.c:425
+#: ../src/disks/gduformatvolumedialog.c:178
 msgid "_Format"
 msgstr "æåå(_F)"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:100
+#: ../src/disks/gduformatvolumedialog.c:100
 msgid "Error formatting volume"
 msgstr "æåååååæççéè"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:157
+#: ../src/disks/gduformatvolumedialog.c:161
 msgid "Are you sure you want to format the volume?"
 msgstr "çåèæååæåååï"
 
-#: ../src/palimpsest/gdufstabdialog.c:166
+#. Translators: warning used for quick format of the volume
+#: ../src/disks/gduformatvolumedialog.c:165
+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:172
+msgid ""
+"All data on the volume will be overwritten and will likely not be "
+"recoverable by data recovery services"
+msgstr "åååäææçèæåæèèåïèäåèçæäçèæååæåäéå"
+
+#: ../src/disks/gdufstabdialog.c:166
 #, 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:169
 msgid "Matches the whole disk of the device with the given vital product data"
 msgstr "äæåççéçåèææåèççæåçç"
 
-#: ../src/palimpsest/gdufstabdialog.c:174
+#: ../src/disks/gdufstabdialog.c:174
 #, 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:177
 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:181
 msgid "Matches any device with the given label"
 msgstr "äæåçæçæåääèç"
 
-#: ../src/palimpsest/gdufstabdialog.c:185
+#: ../src/disks/gdufstabdialog.c:185
 msgid "Matches the device with the given UUID"
 msgstr "äæåç UUID æåääèç"
 
-#: ../src/palimpsest/gdufstabdialog.c:189
+#: ../src/disks/gdufstabdialog.c:189
 msgid "Matches the given device"
 msgstr "çåæåçèç"
 
-#: ../src/palimpsest/gdufstabdialog.c:473
+#: ../src/disks/gdufstabdialog.c:473
 msgid "The system may not work correctly if this entry is modified or removed."
 msgstr "åæéåéçèäææçéççåèçææåéäã"
 
-#: ../src/palimpsest/gdufstabdialog.c:532
+#: ../src/disks/gdufstabdialog.c:532
 msgid "Error removing old /etc/fstab entry"
 msgstr "çéè /etc/fstab éçæççéè"
 
-#: ../src/palimpsest/gdufstabdialog.c:588
+#: ../src/disks/gdufstabdialog.c:588
 msgid "Error adding new /etc/fstab entry"
 msgstr "ååæ /etc/fstab éçæççéè"
 
-#: ../src/palimpsest/gdufstabdialog.c:612
+#: ../src/disks/gdufstabdialog.c:612
 msgid "Error updating /etc/fstab entry"
 msgstr "åææ  /etc/fstab éçæççéè"
 
-#: ../src/palimpsest/gdupartitiondialog.c:369
+#: ../src/disks/gdupartitiondialog.c:369
 msgid "Error setting partition type"
 msgstr "èååååéåæççéè"
 
-#: ../src/palimpsest/gdupartitiondialog.c:383
+#: ../src/disks/gdupartitiondialog.c:383
 msgid "Error setting partition name"
 msgstr "èåååååçæççéè"
 
-#: ../src/palimpsest/gdupartitiondialog.c:397
+#: ../src/disks/gdupartitiondialog.c:397
 msgid "Error setting partition flags"
 msgstr "èååååæææççéè"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:169
+#: ../src/disks/gdupasswordstrengthwidget.c:139
+msgctxt "Password strength"
 msgid "Weak"
-msgstr "å"
+msgstr "åå"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:170
+#: ../src/disks/gdupasswordstrengthwidget.c:140
+msgctxt "Password strength"
 msgid "Fair"
 msgstr "äè"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:171
+#: ../src/disks/gdupasswordstrengthwidget.c:141
+msgctxt "Password strength"
 msgid "Good"
 msgstr "èå"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:172
+#: ../src/disks/gdupasswordstrengthwidget.c:142
+msgctxt "Password strength"
 msgid "Strong"
-msgstr "å"
+msgstr "åå"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:167
+#: ../src/disks/gdurestorediskimagedialog.c:167
 msgid "Cannot restore image of size 0"
 msgstr "äèéåååç 0 çæåæ"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:176
-#, fuzzy, c-format
-#| msgid "The selected image is %s bytes smaller than the device"
+#: ../src/disks/gdurestorediskimagedialog.c:176
+#, c-format
 msgid "The selected image is %s smaller than the device"
-msgstr "éåçæåææèçåä %s äåç"
+msgstr "éåçæåææèçåä %s"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:185
-#, fuzzy, c-format
-#| msgid "The selected image is %s bytes bigger than the device"
+#: ../src/disks/gdurestorediskimagedialog.c:185
+#, c-format
 msgid "The selected image is %s bigger than the device"
-msgstr "éåçæåææèçåä %s äåç"
+msgstr "éåçæåææèçåä %s"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:416
+#: ../src/disks/gdurestorediskimagedialog.c:417
 msgid "Error opening file for reading"
 msgstr "éåææäèåæççéè"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:430
+#: ../src/disks/gdurestorediskimagedialog.c:431
 msgid "Error determing size of file"
 msgstr "æåææçåéæççéè"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:495
+#: ../src/disks/gdurestorediskimagedialog.c:496
 msgid "Are you sure you want to write the disk image to the device?"
 msgstr "çåèåéåççæåæåååèçï"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:496
+#: ../src/disks/gdurestorediskimagedialog.c:497
 msgid "All existing data will be lost"
 msgstr "æææåçèæéææå"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:497
+#: ../src/disks/gdurestorediskimagedialog.c:498
 msgid "_Restore"
 msgstr "éå(_R)"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:500
+#: ../src/disks/gdurestorediskimagedialog.c:501
 #, c-format
 msgid "Copying data to device <i>%s</i>..."
 msgstr "èèèæåèç <i>%s</i>â"
 
-#: ../src/palimpsest/gduunlockdialog.c:50
+#: ../src/disks/gduunlockdialog.c:99
 msgid "Error unlocking encrypted device"
 msgstr "èéåååèçæççéè"
 
-#: ../src/palimpsest/gduutils.c:81
-msgid "All Files"
-msgstr "ææææ"
+#: ../src/disks/gduunlockdialog.c:154
+msgid "The encryption passphrase was retrieved from the keyring"
+msgstr "åååèååéåååå"
 
-#: ../src/palimpsest/gduutils.c:85
-msgid "Disk Images (*.img, *.iso)"
-msgstr "ççæåæ (*.img, *.iso)"
+#. Translators: Used for number of years
+#: ../src/disks/gduutils.c:378
+#, c-format
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%d å"
 
-#: ../src/palimpsest/gduutils.c:105
+#. Translators: Used for number of months
+#: ../src/disks/gduutils.c:385
 #, c-format
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ç"
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d æ"
+
+#. Translators: Used for number of days
+#: ../src/disks/gduutils.c:392
+#, c-format
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%d æ"
 
-#: ../src/palimpsest/gduutils.c:112
-msgid "Less than a minute"
-msgstr "åæäåé"
+#. Translators: Used for number of hours
+#: ../src/disks/gduutils.c:399
+#, c-format
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d æ"
 
-#: ../src/palimpsest/gduutils.c:118
+#. Translators: Used for number of minutes
+#: ../src/disks/gduutils.c:406
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d å"
 
-#: ../src/palimpsest/gduutils.c:126
+#. Translators: Used for number of seconds
+#: ../src/disks/gduutils.c:413
 #, c-format
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d æ"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ç"
+
+#. Translators: Used for number of milli-seconds
+#: ../src/disks/gduutils.c:420
+#, c-format
+msgid "%d milli-second"
+msgid_plural "%d milli-seconds"
+msgstr[0] "%d æç"
+
+#. Translators: Used for duration greater than one year. First %s is number of years, second %s is months, third %s is days
+#: ../src/disks/gduutils.c:484
+#, 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/disks/gduutils.c:489
+#, 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/disks/gduutils.c:494
+#, 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/disks/gduutils.c:499
+#, 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/disks/gduutils.c:504
+#, c-format
+msgctxt "duration-minute-to-hour"
+msgid "%s and %s"
+msgstr "%s %s"
+
+#. Translators: Used for durations less than one minute byte greater than one second. First %s is number of seconds
+#: ../src/disks/gduutils.c:509
+#, 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/disks/gduutils.c:514
+#, c-format
+msgctxt "duration-zero-to-second"
+msgid "%s"
+msgstr "%s"
 
 #. 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
+#: ../src/disks/gduvolumegrid.c:1534
 #, c-format
 msgctxt "volume-grid"
 msgid "Partition %d: %s"
@@ -2034,58 +2652,58 @@ 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
+#: ../src/disks/gduvolumegrid.c:1541
 #, c-format
 msgctxt "volume-grid"
 msgid "Partition %d"
 msgstr "ååå %d"
 
-#: ../src/palimpsest/gduvolumegrid.c:1604
+#: ../src/disks/gduvolumegrid.c:1561
 msgid "No Media"
 msgstr "ææåé"
 
-#: ../src/palimpsest/gduvolumegrid.c:1621
+#: ../src/disks/gduvolumegrid.c:1578
 msgctxt "volume-grid"
 msgid "Free Space"
 msgstr "åççé"
 
-#: ../src/palimpsest/gduvolumegrid.c:1663
+#: ../src/disks/gduvolumegrid.c:1620
 msgctxt "volume-grid"
 msgid "Extended Partition"
 msgstr "åäååå"
 
-#: ../src/palimpsest/gduvolumegrid.c:1687
+#: ../src/disks/gduvolumegrid.c:1644
 msgctxt "volume-grid"
 msgid "Filesystem"
 msgstr "ææçç"
 
-#: ../src/palimpsest/gduvolumegrid.c:1706
+#: ../src/disks/gduvolumegrid.c:1662
 msgctxt "volume-grid"
 msgid "Swap"
 msgstr "çæçé"
 
-#: ../src/palimpsest/gduwindow.c:531
+#: ../src/disks/gduwindow.c:626
 msgid "Error deleting loop device"
 msgstr "åé loop èçæççéè"
 
-#: ../src/palimpsest/gduwindow.c:602 ../src/palimpsest/gduwindow.c:674
+#: ../src/disks/gduwindow.c:697 ../src/disks/gduwindow.c:769
 msgid "Error attaching disk image"
 msgstr "éåççæåææççéè"
 
-#: ../src/palimpsest/gduwindow.c:642
+#: ../src/disks/gduwindow.c:737
 msgid "Select Disk Image to Attach"
 msgstr "éæèéåçççæåæ"
 
-#: ../src/palimpsest/gduwindow.c:646
+#: ../src/disks/gduwindow.c:741
 msgid "_Attach"
 msgstr "éå(_A)"
 
 #. Add a RO check button that defaults to RO
-#: ../src/palimpsest/gduwindow.c:652
+#: ../src/disks/gduwindow.c:747
 msgid "Set up _read-only loop device"
 msgstr "èååèç loop èç(_R)"
 
-#: ../src/palimpsest/gduwindow.c:653
+#: ../src/disks/gduwindow.c:748
 msgid ""
 "If checked, the loop device will be read-only. This is useful if you don't "
 "want the underlying file to be modified"
@@ -2094,28 +2712,50 @@ msgstr ""
 "åå"
 
 #. Translators: Shown for a read-only device. The %s is the device file, e.g. /dev/sdb1
-#: ../src/palimpsest/gduwindow.c:1515
+#: ../src/disks/gduwindow.c:1689
 #, 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:1721
+msgctxt "job-remaining-exceeded"
+msgid "Almost done..."
+msgstr "åäåæâ"
+
+#: ../src/disks/gduwindow.c:1726
+#, 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:1882
+#, fuzzy
+msgid "Connected to another seat"
+msgstr "åæèåäååæ"
+
+#: ../src/disks/gduwindow.c:2183
 msgctxt "partition type"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/palimpsest/gduwindow.c:1849
+#: ../src/disks/gduwindow.c:2215
 msgid "Extended Partition"
 msgstr "åäååå"
 
 #. Translators: Use for mount point '/' simply because '/' is too small to hit as a hyperlink
 #.
-#: ../src/palimpsest/gduwindow.c:1890
+#: ../src/disks/gduwindow.c:2256
 msgid "Filesystem Root"
 msgstr "ææççæ"
 
 #. Translators: Shown next to "In Use". The first %s is the mount point, e.g. /media/foobar
-#: ../src/palimpsest/gduwindow.c:1898
+#: ../src/disks/gduwindow.c:2264
 #, c-format
 msgid "Yes, mounted at %s"
 msgstr "æïæèæ %s"
@@ -2123,84 +2763,126 @@ msgstr "æïæèæ %s"
 #. Translators: Shown when the device is not mounted next to the "In Use" label
 #. Translators: Shown if the swap device is not in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is not unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1904 ../src/palimpsest/gduwindow.c:1940
-#: ../src/palimpsest/gduwindow.c:1966
+#: ../src/disks/gduwindow.c:2270 ../src/disks/gduwindow.c:2306
+#: ../src/disks/gduwindow.c:2332
 msgid "No"
 msgstr "å"
 
 #. Translators: Shown if the swap device is in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1934 ../src/palimpsest/gduwindow.c:1960
+#: ../src/disks/gduwindow.c:2300 ../src/disks/gduwindow.c:2326
 msgid "Yes"
 msgstr "æ"
 
 #. Translators: used to convey free space for partitions - the %s is the
 #. * partition table format e.g. "Master Boot Record" or "GUID Partition Table"
 #.
-#: ../src/palimpsest/gduwindow.c:2039
+#: ../src/disks/gduwindow.c:2459
 #, c-format
 msgid "Unallocated Space (%s)"
 msgstr "æéçççé (%s)"
 
 #. Translators: used to convey free space for partitions (partition table format not known)
-#: ../src/palimpsest/gduwindow.c:2044
+#: ../src/disks/gduwindow.c:2464
 msgid "Unallocated Space"
 msgstr "æéçççé"
 
-#: ../src/palimpsest/gduwindow.c:2400
+#: ../src/disks/gduwindow.c:2831
+msgid "An error occurred when trying to put the drive into standby mode"
+msgstr "çåèèççæéåååæåæççéè"
+
+#: ../src/disks/gduwindow.c:2877
+msgid "An error occurred when trying to wake up the drive from standby mode"
+msgstr "çåèèççæåååæååéæççéè"
+
+#: ../src/disks/gduwindow.c:2952
 msgid "Error mounting filesystem"
 msgstr "æèææççæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2440
+#: ../src/disks/gduwindow.c:2992
 msgid "Error unmounting filesystem"
 msgstr "åèææççæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2519
+#: ../src/disks/gduwindow.c:3073
 msgid "Error deleting partition"
 msgstr "åéåååæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2535
+#: ../src/disks/gduwindow.c:3089
 msgid "Are you sure you want to delete the partition?"
 msgstr "çåèåéæåååï"
 
-#: ../src/palimpsest/gduwindow.c:2536
+#: ../src/disks/gduwindow.c:3090
 msgid "All data on the partition will be lost"
 msgstr "åååäçææèæåææå"
 
-#: ../src/palimpsest/gduwindow.c:2537
+#: ../src/disks/gduwindow.c:3091
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/palimpsest/gduwindow.c:2568
+#: ../src/disks/gduwindow.c:3122
 msgid "Error ejecting media"
 msgstr "éååéæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2620
+#: ../src/disks/gduwindow.c:3174
 msgid "Error locking encrypted device"
 msgstr "éåååçèçæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2661
+#: ../src/disks/gduwindow.c:3215
 msgid "Error starting swap"
 msgstr "ååçæåæççéè"
 
-#: ../src/palimpsest/gduwindow.c:2698
+#: ../src/disks/gduwindow.c:3252
 msgid "Error stopping swap"
 msgstr "åæçæåæççéè"
 
-#, fuzzy
-#~| msgid "Attach Disk Image..."
-#~ msgid "Attach Disk _Image..."
-#~ msgstr "æäççæåæ(_I)â"
+#: ../src/disks/gduwindow.c:3294
+msgid "Error setting autoclear flag"
+msgstr "èå autoclear æææççéè"
+
+#: ../src/disks/gduwindow.c:3347 ../src/disks/gduwindow.c:3402
+msgid "Error canceling job"
+msgstr "åæåäæççéè"
+
+#~ msgid "Normalized"
+#~ msgstr "æåå"
+
+#~ msgid "Updates"
+#~ msgstr "ææ"
+
+#~ msgid "%.1f hour"
+#~ msgid_plural "%.1f hours"
+#~ msgstr[0] "%.1f åæ"
+
+#~ msgid "%.1f minute"
+#~ msgid_plural "%.1f minutes"
+#~ msgstr[0] "%.1f åé"
 
-#~ msgid "_About Disks"
-#~ msgstr "éæçç(_A)"
+#~ msgid "%.1f second"
+#~ msgid_plural "%.1f seconds"
+#~ msgstr[0] "%.1f çé"
 
-#~ msgid "_Quit"
-#~ msgstr "éé(_Q)"
+#~ msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
+#~ msgstr "åçåææ 24 åæåååççççææçåå (éåççéè)"
 
-#~| msgid "_Restore"
-#~ msgid "Reset"
-#~ msgstr "éè"
+#~ msgid ""
+#~ "Failure is a sign the disk exceeded its intended design life period (Old-"
+#~ "Age)"
+#~ msgstr "åçåææççæåèéåèèçäçåé (èå)"
+
+#~ msgid "Every time data is collected (Online)"
+#~ msgstr "ææèæéææé (äç)"
+
+#~ msgid "Only during off-line activities (Not Online)"
+#~ msgstr "ååéçæåæéïéäççæï"
+
+#~ msgid "Name"
+#~ msgstr "åç"
+
+#~ msgid "All data on the volume will be lost"
+#~ msgstr "åååäçææèæåææå"
+
+#~ msgid "Less than a minute"
+#~ msgstr "åæäåé"
 
 #~ msgid ""
 #~ "The name to use for the unlocked device - the device is set up as the "
@@ -2241,12 +2923,6 @@ msgstr "åæçæåæççéè"
 #~ msgid "%d seconds"
 #~ msgstr "%d ç"
 
-#~ msgid "%d minutes"
-#~ msgstr "%d å"
-
-#~ msgid "%d hours"
-#~ msgstr "%d æ"
-
 #~ msgid "Checked if an entry in the /etc/crypttab file exists for the device"
 #~ msgstr "ææéåèçå /etc/crypttab ææäæåååéç"
 



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