[gnome-disk-utility/gnome-3-6] [l10n] Update Japanese translation



commit 4347311e8bedae72d3f8e3cd5a0bf5beb39528a9
Author: Jiro Matsuzawa <jmatsuzawa gnome org>
Date:   Sun Feb 17 12:21:53 2013 +0900

    [l10n] Update Japanese translation
    
    Merge the latest pot.

 po/ja.po | 2417 +++++++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 1522 insertions(+), 895 deletions(-)
---
diff --git a/po/ja.po b/po/ja.po
index 31e0d75..420556b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,27 +8,47 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gnome-disk-utility master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-";
-"disk-utility&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-24 09:53+0000\n"
+"Report-Msgid-Bugs-To: 
http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-disk-utility&keywords=I18N+L10N&component=general\n";
+"POT-Creation-Date: 2013-01-04 11:17+0000\n"
 "PO-Revision-Date: 2012-03-25 22:30+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa src gnome org>\n"
 "Language-Team: Japanese <gnome-translation gnome gr jp>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../data/palimpsest.desktop.in.h:1 ../data/ui/about-dialog.ui.h:1
-#: ../src/palimpsest/gduwindow.c:888
+#: ../data/gnome-disk-image-mounter.desktop.in.h:1
+#: ../src/disk-image-mounter/main.c:46
+#, fuzzy
+#| msgid "Select Disk Image to restore"
+msgid "Disk Image Mounter"
+msgstr "ãããããããããããããããéæ"
+
+#: ../data/gnome-disk-image-mounter.desktop.in.h:2
+#, fuzzy
+#| msgid "Detach Disk Image"
+msgid "Mount Disk Images"
+msgstr "ããããããããããããã"
+
+#: ../data/gnome-disks.desktop.in.h:1 ../data/ui/about-dialog.ui.h:1
+#: ../src/disks/gduwindow.c:1000
 msgid "Disks"
 msgstr "ãããã"
 
-#: ../data/palimpsest.desktop.in.h:2
+#: ../data/gnome-disks.desktop.in.h:2
 msgid "Manage Drives and Media"
 msgstr "ããããããããããçç"
 
+#: ../data/org.gnome.Disks.gschema.xml.in.in.h:1
+msgid "Default location for the Create/Restore disk image dialogs"
+msgstr ""
+
+#: ../data/org.gnome.Disks.gschema.xml.in.in.h:2
+msgid "Default location for the Create/Restore disk image dialogs. If blank the ~/Documents folder is used."
+msgstr ""
+
 #: ../data/ui/about-dialog.ui.h:2
 msgid ""
 "Copyright  2008-2012 Red Hat, Inc.\n"
@@ -67,18 +87,121 @@ msgstr ""
 msgid "_Quit"
 msgstr ""
 
+#: ../data/ui/benchmark-dialog.ui.h:1
+msgid "Benchmark"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:2
+#, fuzzy
+#| msgid "_Start Creating..."
+msgid "_Start Benchmark..."
+msgstr "äæãéåããããã(_S)..."
+
+#: ../data/ui/benchmark-dialog.ui.h:3
+msgid "_Abort Benchmark"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:4
+msgid "Last Benchmarked"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:5
+msgid "Average Read Rate"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:6
+#, fuzzy
+#| msgid "Thermal Asperity Rate"
+msgid "Average Write Rate"
+msgstr "Thermal Asperity Rate"
+
+#: ../data/ui/benchmark-dialog.ui.h:7
+msgid "Average Access Time"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:8
+#, fuzzy
+#| msgid "Disk Drives"
+msgid "Disk Drive or Device"
+msgstr "ãããããããã"
+
+#: ../data/ui/benchmark-dialog.ui.h:9
+msgid "Sample Size"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:10
+#, fuzzy
+#| msgid "_Start Creating..."
+msgid "_Start Benchmarking..."
+msgstr "äæãéåããããã(_S)..."
+
+#: ../data/ui/benchmark-dialog.ui.h:11
+msgid "Benchmarking involves measuring the transfer rate on various area of the device as well as measuring 
how long it takes to seek from one random area to another. Please back up important data before using the 
write benchmark."
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:12
+#, fuzzy
+#| msgid "Thermal Asperity Rate"
+msgid "Transfer Rate"
+msgstr "Thermal Asperity Rate"
+
+#: ../data/ui/benchmark-dialog.ui.h:13
+#, fuzzy
+#| msgid "Number of ECC errors"
+msgid "Number of S_amples"
+msgstr "ECC ããããåæ"
+
+#: ../data/ui/benchmark-dialog.ui.h:14
+msgid "Sample S_ize (MiB)"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:15
+msgid "Also perform _write-benchmark"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:16
+msgid ""
+"Bechmarking the write-rate of a disk requires exclusive access to the disk (e.g. the disk or its partitions 
cannot be mounted or in use) and involves reading data and then writing it back. As a result, the contents of 
the disk is not changed.\n"
+"\n"
+"If not checked, the write-part of the benchmark will not be done but on the other hand exclusive access to 
the device is not needed (e.g. the disk or device can be in use) ."
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:19
+msgid "Number of samples. Bigger number produces a more accurate picture of access time patterns but takes 
more time."
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:20
+msgid "The number of MiB (1048576 bytes) to read/write for each sample. Big sample sizes tend to produce 
more accurate benchmarks at the cost of the benchmark taking more time."
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:21
+msgid "Access Time"
+msgstr ""
+
+#: ../data/ui/benchmark-dialog.ui.h:22
+#, fuzzy
+#| msgid "Number of ECC errors"
+msgid "Number of Sampl_es"
+msgstr "ECC ããããåæ"
+
+#: ../data/ui/benchmark-dialog.ui.h:23
+msgid "Number of samples. Bigger number produces more smooth graphs but the benchmark will take more time."
+msgstr ""
+
 #: ../data/ui/change-passphrase-dialog.ui.h:1
-#: ../data/ui/edit-dos-partition-dialog.ui.h:1
+#, fuzzy
+#| msgid "Change Passphrase..."
+msgid "Change Passphrase"
+msgstr "ãããããããåæ..."
+
+#: ../data/ui/change-passphrase-dialog.ui.h:2
+#: ../data/ui/edit-dos-partition-dialog.ui.h:2
 #: ../data/ui/edit-filesystem-dialog.ui.h:2
-#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
-#: ../data/ui/edit-partition-dialog.ui.h:1
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:2
+#: ../data/ui/edit-partition-dialog.ui.h:2
 msgid "C_hange"
 msgstr "åæ(_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
 msgid "Curr_ent Passphrase"
 msgstr "çåããããããã(_E)"
@@ -95,9 +218,7 @@ msgstr "ãããããããèç(_W)"
 #: ../data/ui/change-passphrase-dialog.ui.h:6
 #: ../data/ui/filesystem-create.ui.h:13
 msgid "Check this box to see the passphrases entered above"
-msgstr ""
-"äãåãããããããããèçããååããããããããããããããåããããã"
-"ã"
+msgstr "äãåãããããããããèçããååããããããããããããããåãããããã"
 
 #: ../data/ui/change-passphrase-dialog.ui.h:7
 #: ../data/ui/filesystem-create.ui.h:11
@@ -118,39 +239,37 @@ msgid "New _Passphrase"
 msgstr "æãããããããã(_P)"
 
 #: ../data/ui/create-disk-image-dialog.ui.h:1
-msgid "<big>Create Disk Image</big>"
-msgstr "<big>ãããããããããäæ</big>"
-
-#: ../data/ui/create-disk-image-dialog.ui.h:2
-msgid "_Start Creating..."
-msgstr "äæãéåããããã(_S)..."
-
-#: ../data/ui/create-disk-image-dialog.ui.h:3
-#: ../data/ui/edit-crypttab-dialog.ui.h:3
+#: ../data/ui/edit-crypttab-dialog.ui.h:4
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:5
 #: ../data/ui/filesystem-create.ui.h:2
 msgid "_Name"
 msgstr "åå(_N)"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:4
+#: ../data/ui/create-disk-image-dialog.ui.h:2
 msgid "Save in _folder"
 msgstr "ããããããäå(_F)"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:5
+#: ../data/ui/create-disk-image-dialog.ui.h:3
 msgid "Select a Folder"
 msgstr "ããããããéæ"
 
-#: ../data/ui/create-disk-image-dialog.ui.h:6
+#: ../data/ui/create-disk-image-dialog.ui.h:4
 msgid "Copying data to disk image..."
 msgstr "ããããããããããããããããä..."
 
+#: ../data/ui/create-disk-image-dialog.ui.h:5
+msgid "_Start Creating..."
+msgstr "äæãéåããããã(_S)..."
+
 #: ../data/ui/create-partition-dialog.ui.h:1
-msgid "C_reate"
-msgstr "äæ(_R)"
+#, fuzzy
+#| msgid "<big>Create Partition</big>"
+msgid "Create Partition"
+msgstr "<big>ããããããããäæ</big>"
 
 #: ../data/ui/create-partition-dialog.ui.h:2
-msgid "<big>Create Partition</big>"
-msgstr "<big>ããããããããäæ</big>"
+msgid "C_reate"
+msgstr "äæ(_R)"
 
 #: ../data/ui/create-partition-dialog.ui.h:3
 msgid "Partition _Size"
@@ -172,90 +291,323 @@ msgstr "æãçãåé(_F)"
 msgid "The free space following the partition, in megabytes"
 msgstr "ãããããããåãçãåé (MB)"
 
-#: ../data/ui/create-partition-dialog.ui.h:8
-msgid "<big>Contents</big>"
-msgstr "<big>åå</big>"
+#. The contents of the device, for example 'Unknown', 'FAT (32-bit version)', 'Ext4 (version 1.0)', 'Swap 
(version 2)'
+#: ../data/ui/create-partition-dialog.ui.h:8 ../data/ui/disks.ui.h:26
+#, fuzzy
+#| msgid "C_omponents"
+msgid "Contents"
+msgstr "ããããããã(_O)"
+
+#: ../data/ui/disk-settings-dialog.ui.h:1
+msgid "Drive Settings"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:2
+msgid "_Standby Timeout"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:3
+msgid "Enter Standby After"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:4
+msgid "_Advanced Power Management"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:5
+msgid "APM Level"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:6
+msgid "Agressive spin-down may wear out the drive faster than anticipated. Please check the âStart/Stop 
Countâ SMART attribute from time to time"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:7
+msgid "Automatic Aco_ustic Management"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:8
+msgid "Vendor Recommended"
+msgstr ""
+
+#: ../data/ui/disk-settings-dialog.ui.h:9
+msgid "AAM Level"
+msgstr ""
+
+#: ../data/ui/disks.ui.h:1
+msgid "Create a new partition..."
+msgstr "æèããããããããäæ..."
+
+#: ../data/ui/disks.ui.h:2
+msgid "Mount the filesystem"
+msgstr "ããããããããããããã"
+
+#: ../data/ui/disks.ui.h:3
+#, fuzzy
+#| msgid "Mount the filesystem on device"
+msgid "Unmount the filesystem"
+msgstr "ããããäããããããããããããããããã"
+
+#: ../data/ui/disks.ui.h:4
+msgid "Eject the media"
+msgstr "ãããããåãåã"
+
+#: ../data/ui/disks.ui.h:5
+#, fuzzy
+#| msgid "Error locking encrypted device"
+msgid "Unlock the encrypted device"
+msgstr "æååããããããããäãããããççãããã"
+
+#: ../data/ui/disks.ui.h:6
+msgid "Activate the swap space"
+msgstr "ããããéåãæåããã"
+
+#: ../data/ui/disks.ui.h:7
+msgid "Deactivate the swap space"
+msgstr "ããããéåãçåããã"
+
+#: ../data/ui/disks.ui.h:8
+msgid "Lock the encrypted device"
+msgstr "æååãããããããã"
+
+#: ../data/ui/disks.ui.h:9
+#, fuzzy
+#| msgid "More Information"
+msgid "More actions..."
+msgstr "èçæå"
+
+#: ../data/ui/disks.ui.h:10
+msgid "Delete partition..."
+msgstr "ããããããããåé..."
+
+#: ../data/ui/disks.ui.h:11
+msgid "Attach Disk Image..."
+msgstr "ããããããããããããã..."
+
+#: ../data/ui/disks.ui.h:12
+msgid "Detach Disk Image"
+msgstr "ããããããããããããã"
+
+#: ../data/ui/disks.ui.h:13
+msgid "Select a device"
+msgstr "ãããããéæ"
+
+#: ../data/ui/disks.ui.h:14
+msgid "Model"
+msgstr "ãããå"
+
+#: ../data/ui/disks.ui.h:15
+msgid "Serial Number"
+msgstr "ãããããããã"
+
+#: ../data/ui/disks.ui.h:16
+msgid "World Wide Name"
+msgstr ""
+
+#. The physical location of the drive, could be 'Connected to another seat'  or 'Bay 11 of Promise VTrak' or 
'USB connector II'
+#: ../data/ui/disks.ui.h:18
+#, fuzzy
+#| msgid "Load Friction"
+msgid "Location"
+msgstr "Load Friction"
+
+#: ../data/ui/disks.ui.h:19
+msgid "Media"
+msgstr "ãããã"
+
+#: ../data/ui/disks.ui.h:20
+msgid "Size"
+msgstr "ããã"
+
+#. Translators: This string is used as the column title in the treeview for the assessment of the attribute
+#: ../data/ui/disks.ui.h:21 ../src/disks/gduatasmartdialog.c:1503
+#, fuzzy
+msgid "Assessment"
+msgstr "èä"
+
+#: ../data/ui/disks.ui.h:22
+msgid "Eject media"
+msgstr "ãããããåãåã"
+
+#: ../data/ui/disks.ui.h:23
+msgid "Pending Operation"
+msgstr ""
+
+#: ../data/ui/disks.ui.h:24
+#, fuzzy
+#| msgid "<b>_Volumes</b>"
+msgid "_Volumes"
+msgstr "<b>ããããã(_V)</b>"
+
+#: ../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
+#, fuzzy
+#| msgid "Partition Type:"
+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
+#, fuzzy
+#| msgid "Checking File System"
+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
+#, fuzzy
+#| msgid "SM_ART Data"
+msgid "SMART Data and Tests..."
+msgstr "SMART ããããèç..."
+
+#: ../data/ui/disks.ui.h:38
+#, fuzzy
+#| msgid "More Information"
+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
+#, fuzzy
+#| msgid "More Information"
+msgid "Edit Mount Options..."
+msgstr "èçæå"
+
+#: ../data/ui/disks.ui.h:46
+#, fuzzy
+#| msgid "Edit Partition Type..."
+msgid "Edit Encryption Options..."
+msgstr "ãããããããããããçé..."
+
+#: ../data/ui/disks.ui.h:47
+msgid "Benchmark Volume..."
+msgstr ""
 
 #: ../data/ui/edit-crypttab-dialog.ui.h:1
+#, fuzzy
+#| msgid "Edit Partition Type..."
+msgid "Encryption Options"
+msgstr "ãããããããããããçé..."
+
+#: ../data/ui/edit-crypttab-dialog.ui.h:2
 msgid "_Automatic Encryption Options"
 msgstr ""
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:2
-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"
+#: ../data/ui/edit-crypttab-dialog.ui.h:3
+msgid "Switch off <i>Automatic Encryption Options</i> to manage encryption options and passphrase for the 
device. The options correspond to an entry in the <b>/etc/crypttab</b> file"
 msgstr ""
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:4
+#: ../data/ui/edit-crypttab-dialog.ui.h:5
 #, fuzzy
 #| msgid "_Options"
 msgid "Opt_ions"
 msgstr "ããããã(_O)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:5
+#: ../data/ui/edit-crypttab-dialog.ui.h:6
 #, fuzzy
-msgid ""
-"The name to use for the unlocked device - the device is set up as the name "
-"prefixed with <b>/dev/mapper</b>/"
+msgid "The name to use for the unlocked device - the device is set up as the name prefixed with 
<b>/dev/mapper</b>/"
 msgstr "ããããããããããããããäãåå - ããããã /dev/mapper/ "
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:6
+#: ../data/ui/edit-crypttab-dialog.ui.h:7
 msgid "Options to use when unlocking the device"
 msgstr "ããããããããããããéãããããã"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:7
+#: ../data/ui/edit-crypttab-dialog.ui.h:8
 msgid "Passphrase File"
 msgstr "ãããããããããã"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:8
+#: ../data/ui/edit-crypttab-dialog.ui.h:9
 #: ../data/ui/unlock-device-dialog.ui.h:3
 msgid "Sho_w passphrase"
 msgstr "ãããããããèç(_W)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:9
-msgid ""
-"Passphrase of the device or empty to request from user when setting up the "
-"device"
+#: ../data/ui/edit-crypttab-dialog.ui.h:10
+msgid "Passphrase of the device or empty to request from user when setting up the device"
 msgstr ""
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:10 ../data/ui/filesystem-create.ui.h:8
+#: ../data/ui/edit-crypttab-dialog.ui.h:11 ../data/ui/filesystem-create.ui.h:8
 #: ../data/ui/unlock-device-dialog.ui.h:2
 msgid "_Passphrase"
 msgstr "ãããããã(_P)"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:11
+#: ../data/ui/edit-crypttab-dialog.ui.h:12
 #, fuzzy
 #| msgid "Don't unlock at startup"
 msgid "_Unlock at startup"
 msgstr "èåæããããããããã"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:12
+#: ../data/ui/edit-crypttab-dialog.ui.h:13
 #, fuzzy
 #| msgid "If checked, the device will not be unlocked at startup [noauto]"
 msgid "If checked, the device will be unlocked at startup [!noauto]"
-msgstr ""
-"ãããããåãããããããããããèåæããããããããããã [noauto]"
+msgstr "ãããããåãããããããããããèåæããããããããããã [noauto]"
 
-#: ../data/ui/edit-crypttab-dialog.ui.h:13
+#: ../data/ui/edit-crypttab-dialog.ui.h:14
 #, fuzzy
 #| msgid "Require additional authorization to unlock"
 msgid "Require additional authori_zation to unlock"
 msgstr "ãããããããèåãèèãåèãã"
 
-#: ../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-crypttab-dialog.ui.h:15
+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:1
+#: ../data/ui/edit-gpt-partition-dialog.ui.h:1
+#: ../data/ui/edit-partition-dialog.ui.h:1
+#, fuzzy
+#| msgid "Edit Partition Type..."
+msgid "Edit Partition"
+msgstr "ãããããããããããçé..."
 
 #: ../data/ui/edit-dos-partition-dialog.ui.h:3
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:3
@@ -272,14 +624,13 @@ 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"
+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 ""
 
 #: ../data/ui/edit-filesystem-dialog.ui.h:1
-msgid "<big>Change Filesystem Label</big>"
+#, fuzzy
+#| msgid "<big>Change Filesystem Label</big>"
+msgid "Change Filesystem Label"
 msgstr "<big>ãããããããããããããåæ</big>"
 
 #: ../data/ui/edit-filesystem-dialog.ui.h:3
@@ -287,132 +638,118 @@ msgid "_Label"
 msgstr "ããã(_L)"
 
 #: ../data/ui/edit-fstab-dialog.ui.h:1
-msgid "_Automatic Mount Options"
-msgstr ""
+#, fuzzy
+#| msgid "Mount options to use"
+msgid "Mount Options"
+msgstr "åçããããããããããã"
 
 #: ../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"
+msgid "_Automatic Mount Options"
 msgstr ""
 
 #: ../data/ui/edit-fstab-dialog.ui.h:3
-msgid "I_dentify As"
+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 ""
 
 #: ../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"
+msgid "I_dentify As"
 msgstr ""
 
 #: ../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"
+msgid "The <b>special device file</b> - use symlinks in the <b>/dev/disk</b> hierarchy to control the scope 
of the entry"
 msgstr ""
 
 #: ../data/ui/edit-fstab-dialog.ui.h:6
+msgid "The special device file - use symlinks in the /dev/disk hierarchy to control the scope of the entry"
+msgstr ""
+
+#: ../data/ui/edit-fstab-dialog.ui.h:7
 #, fuzzy
 #| msgid "Mount options to use"
 msgid "Mount _Point"
 msgstr "åçããããããããããã"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:7
+#: ../data/ui/edit-fstab-dialog.ui.h:8
 #, fuzzy
 #| msgid "Filesystem"
 msgid "Filesystem _Type"
 msgstr "ãããããããã"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:8
+#: ../data/ui/edit-fstab-dialog.ui.h:9
 msgid "The directory to mount the device in"
 msgstr "ããããããããããããããããã"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:9
+#: ../data/ui/edit-fstab-dialog.ui.h:10
 #, fuzzy
 #| msgid "The selected filesystem type"
 msgid "The filesystem type to use"
 msgstr "éæããããããããããããããããã"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:10
+#: ../data/ui/edit-fstab-dialog.ui.h:11
 msgid "Display _Name"
 msgstr "ååãèç(_N)"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:11
-msgid ""
-"If set, the name to use for the device in the user interface [x-gvfs-name=]"
+#: ../data/ui/edit-fstab-dialog.ui.h:12
+msgid "If set, the name to use for the device in the user interface [x-gvfs-name=]"
 msgstr ""
 
-#: ../data/ui/edit-fstab-dialog.ui.h:12
+#: ../data/ui/edit-fstab-dialog.ui.h:13
 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=]"
+#: ../data/ui/edit-fstab-dialog.ui.h:14
+msgid "If set, the name of the icon to use in the device in the user interface [x-gvfs-icon=]"
 msgstr ""
 
-#: ../data/ui/edit-fstab-dialog.ui.h:14
+#: ../data/ui/edit-fstab-dialog.ui.h:15
 #, fuzzy
 #| msgid "Never show in user interface"
 msgid "Sho_w in user interface"
 msgstr "ãããããããããããããèçããã"
 
-#: ../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]"
+#: ../data/ui/edit-fstab-dialog.ui.h:16
+msgid "If checked, the device is always shown in the user interface no matter what its directory is 
[x-gvfs-show]"
 msgstr ""
 
-#: ../data/ui/edit-fstab-dialog.ui.h:16
+#: ../data/ui/edit-fstab-dialog.ui.h:17
 #, fuzzy
 #| msgid "Require additional authorization to mount"
 msgid "Require additional authori_zation to mount"
 msgstr "ããããããããèåãèèãåè"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:17
-msgid ""
-"If checked, additional authorization is required to mount the device [x-"
-"udisks-auth]"
+#: ../data/ui/edit-fstab-dialog.ui.h:18
+msgid "If checked, additional authorization is required to mount the device [x-udisks-auth]"
 msgstr ""
 
-#: ../data/ui/edit-fstab-dialog.ui.h:18
+#: ../data/ui/edit-fstab-dialog.ui.h:19
 #, fuzzy
 #| msgid "Don't mount at startup"
 msgid "Mount at _startup"
 msgstr "èåæãããããããã"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:19
+#: ../data/ui/edit-fstab-dialog.ui.h:20
 #, fuzzy
 #| msgid "If checked, the device will not be unlocked at startup [noauto]"
 msgid "If checked, the device will be mounted at startup [!noauto]"
-msgstr ""
-"ãããããåãããããããããããèåæããããããããããã [noauto]"
+msgstr "ãããããåãããããããããããèåæããããããããããã [noauto]"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:20
+#: ../data/ui/edit-fstab-dialog.ui.h:21
 #, fuzzy
 #| msgid "Mount options to use"
 msgid "Mount Opt_ions"
 msgstr "åçããããããããããã"
 
-#: ../data/ui/edit-fstab-dialog.ui.h:21
+#: ../data/ui/edit-fstab-dialog.ui.h:22
 #, fuzzy
 msgid "The mount options stored in the <b>/etc/fstab</b> file"
-msgstr ""
-"ãããããããããããã <b>/etc/fstab</b> ãããããããååããããããåã"
-"ãã"
+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 ""
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:6
-msgid ""
-"The partition name (up to 36 unicode characters). This is useful if you want "
-"to refer to the device via a symlink in the <b>/dev/disk/by-partlabel</b> "
-"directory"
+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 ""
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:7
@@ -420,10 +757,7 @@ msgid "_System partition"
 msgstr "ããããããããããã(_S)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:8
-msgid ""
-"Used to indicate that the partition and its contents are required for the OS/"
-"Platform to function. Special care should be taken to not delete or "
-"overwrite the contents"
+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 ""
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:9
@@ -433,9 +767,7 @@ msgid "Legacy BIOS _Bootable"
 msgstr "ãããåè(_B)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:10
-msgid ""
-"Legacy BIOS Bootable. This is equivalent to Master Boot Record <i>bootable</"
-"i> flag. It is normally only used for GPT partitions on MBR systems"
+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 ""
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:11
@@ -443,9 +775,7 @@ msgid "_Read-Only"
 msgstr "èãåãåç(_R)"
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:12
-msgid ""
-"If set, some OSes may mount or use the contents of the partition as read-"
-"only instead of read-write"
+msgid "If set, some OSes may mount or use the contents of the partition as read-only instead of read-write"
 msgstr ""
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:13
@@ -453,9 +783,7 @@ msgid "H_idden"
 msgstr ""
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:14
-msgid ""
-"If set, some OSes may hide the contents of the partition in their user "
-"interfaces"
+msgid "If set, some OSes may hide the contents of the partition in their user interfaces"
 msgstr ""
 
 #: ../data/ui/edit-gpt-partition-dialog.ui.h:15
@@ -467,15 +795,11 @@ msgid "If set, some OSes may not automount the contents of the partition"
 msgstr ""
 
 #: ../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"
+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 ""
 
 #: ../data/ui/filesystem-create.ui.h:4
-msgid ""
-"The name to use for the filesystem. This is useful if you want to refer to "
-"the device via a symlink in the /dev/disk/by-label directory"
+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 ""
 
 #: ../data/ui/filesystem-create.ui.h:5
@@ -483,240 +807,83 @@ msgid "F_ilesystem"
 msgstr "ãããããããã(_I)"
 
 #: ../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 ""
-
-#: ../data/ui/filesystem-create.ui.h:7
-msgid "The custom filesystem type to create e.g. btrfs, xfs or swap"
-msgstr ""
-
-#: ../data/ui/filesystem-create.ui.h:10
-msgid "Enter passphrase used to protect the data"
-msgstr "ããããäèããããäããããããããååãããããã"
-
-#: ../data/ui/format-disk-dialog.ui.h:1 ../data/ui/format-volume-dialog.ui.h:1
-msgid "_Format..."
-msgstr "åæå(_F)..."
-
-#: ../data/ui/format-disk-dialog.ui.h:2
-msgid "<big>Format Disk</big>"
-msgstr ""
-
-#: ../data/ui/format-disk-dialog.ui.h:3
-msgid "_Partitioning"
-msgstr "ããããããã(_P)"
-
-#: ../data/ui/format-volume-dialog.ui.h:2
-msgid "<big>Format Volume</big>"
-msgstr "<big>ããããããåæå</big>"
-
-#: ../data/ui/palimpsest.ui.h:1
-msgid "Create a new partition..."
-msgstr "æèããããããããäæ..."
-
-#: ../data/ui/palimpsest.ui.h:2
-msgid "Mount the filesystem"
-msgstr "ããããããããããããã"
-
-#: ../data/ui/palimpsest.ui.h:3
-#, fuzzy
-#| msgid "Mount the filesystem on device"
-msgid "Unmount the filesystem"
-msgstr "ããããäããããããããããããããããã"
-
-#: ../data/ui/palimpsest.ui.h:4
-msgid "Eject the media"
-msgstr "ãããããåãåã"
-
-#: ../data/ui/palimpsest.ui.h:5
-#, fuzzy
-#| msgid "Error locking encrypted device"
-msgid "Unlock the encrypted device"
-msgstr "æååããããããããäãããããççãããã"
-
-#: ../data/ui/palimpsest.ui.h:6
-msgid "Activate the swap space"
-msgstr "ããããéåãæåããã"
-
-#: ../data/ui/palimpsest.ui.h:7
-msgid "Deactivate the swap space"
-msgstr "ããããéåãçåããã"
-
-#: ../data/ui/palimpsest.ui.h:8
-msgid "Lock the encrypted device"
-msgstr "æååãããããããã"
-
-#: ../data/ui/palimpsest.ui.h:9
-#, fuzzy
-#| msgid "More Information"
-msgid "More actions..."
-msgstr "èçæå"
-
-#: ../data/ui/palimpsest.ui.h:10
-msgid "Delete partition..."
-msgstr "ããããããããåé..."
-
-#: ../data/ui/palimpsest.ui.h:11
-msgid "Format Disk..."
-msgstr "ãããããåæå..."
-
-#: ../data/ui/palimpsest.ui.h:12
-msgid "Create Disk Image..."
-msgstr "ãããããããããäæ..."
-
-#: ../data/ui/palimpsest.ui.h:13
-msgid "Restore Disk Image..."
-msgstr "ããããããããããããã..."
-
-#: ../data/ui/palimpsest.ui.h:14
-#, fuzzy
-#| msgid "SM_ART Data"
-msgid "View SMART Data..."
-msgstr "SMART ããããèç..."
-
-#: ../data/ui/palimpsest.ui.h:15
-msgid "Format..."
-msgstr "åæå..."
-
-#: ../data/ui/palimpsest.ui.h:16
-msgid "Edit Partition Type..."
-msgstr "ãããããããããããçé..."
-
-#: ../data/ui/palimpsest.ui.h:17
-msgid "Edit Filesystem Label..."
-msgstr "ãããããããããããããçé..."
-
-#: ../data/ui/palimpsest.ui.h:18
-msgid "Change Passphrase..."
-msgstr "ãããããããåæ..."
-
-#: ../data/ui/palimpsest.ui.h:19
-#, fuzzy
-#| msgid "More Information"
-msgid "Edit Mount Options..."
-msgstr "èçæå"
-
-#: ../data/ui/palimpsest.ui.h:20
-#, fuzzy
-#| msgid "Edit Partition Type..."
-msgid "Edit Encryption Options..."
-msgstr "ãããããããããããçé..."
-
-#: ../data/ui/palimpsest.ui.h:21
-msgid "Attach Disk Image..."
-msgstr "ããããããããããããã..."
-
-#: ../data/ui/palimpsest.ui.h:22
-msgid "Detach Disk Image"
-msgstr "ããããããããããããã"
-
-#: ../data/ui/palimpsest.ui.h:23
-msgid "Select a device"
-msgstr "ãããããéæ"
-
-#: ../data/ui/palimpsest.ui.h:24
-msgid "Model"
-msgstr "ãããå"
-
-#: ../data/ui/palimpsest.ui.h:25
-msgid "Serial Number"
-msgstr "ãããããããã"
-
-#: ../data/ui/palimpsest.ui.h:26
-msgid "World Wide Name"
+msgid "The custom filesystem type to create e.g. <i>btrfs</i>, <i>xfs</i> or <i>swap</i>"
 msgstr ""
 
-#: ../data/ui/palimpsest.ui.h:27
-msgid "Media"
-msgstr "ãããã"
-
-#: ../data/ui/palimpsest.ui.h:28
-msgid "Size"
-msgstr "ããã"
-
-#. Translators: This string is used as the column title in the treeview for the assessment of the attribute
-#: ../data/ui/palimpsest.ui.h:29 ../src/palimpsest/gduatasmartdialog.c:1632
-#, fuzzy
-msgid "Assessment"
-msgstr "èä"
+#: ../data/ui/filesystem-create.ui.h:7
+msgid "The custom filesystem type to create e.g. btrfs, xfs or swap"
+msgstr ""
 
-#: ../data/ui/palimpsest.ui.h:30
-msgid "Eject media"
-msgstr "ãããããåãåã"
+#: ../data/ui/filesystem-create.ui.h:10
+msgid "Enter passphrase used to protect the data"
+msgstr "ããããäèããããäããããããããååãããããã"
 
-#: ../data/ui/palimpsest.ui.h:31
-msgid "<b>_Volumes</b>"
-msgstr "<b>ããããã(_V)</b>"
+#: ../data/ui/filesystem-create.ui.h:14 ../data/ui/format-disk-dialog.ui.h:4
+msgid "_Erase"
+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:33
+#: ../data/ui/format-disk-dialog.ui.h:1
 #, fuzzy
-#| msgid "C_omponents"
-msgid "Contents"
-msgstr "ããããããã(_O)"
-
-#: ../data/ui/palimpsest.ui.h:34
-msgid "Device"
-msgstr "ãããã"
+#| msgid "Format Disk..."
+msgid "Format Disk"
+msgstr "ãããããåæå..."
 
-#: ../data/ui/palimpsest.ui.h:35
-msgid "In Use"
-msgstr "äçä"
+#: ../data/ui/format-disk-dialog.ui.h:2 ../data/ui/format-volume-dialog.ui.h:2
+msgid "_Format..."
+msgstr "åæå(_F)..."
 
-#: ../data/ui/palimpsest.ui.h:36
-#, fuzzy
-#| msgid "Partition Type:"
-msgid "Partition Type"
-msgstr "ããããããããçé"
+#: ../data/ui/format-disk-dialog.ui.h:3
+msgid "_Partitioning"
+msgstr "ããããããã(_P)"
 
-#. The filename or URI of the file that is used as backing store for the loop device.
-#: ../data/ui/palimpsest.ui.h:38
+#: ../data/ui/format-volume-dialog.ui.h:1
 #, fuzzy
-#| msgid "Checking File System"
-msgid "Backing File"
-msgstr "ãããããããããããããä"
+#| msgid "<big>Format Volume</big>"
+msgid "Format Volume"
+msgstr "<big>ããããããåæå</big>"
 
 #: ../data/ui/restore-disk-image-dialog.ui.h:1
-msgid "<big>Restore Disk Image</big>"
-msgstr "<big>ããããããããããããã</big>"
-
-#: ../data/ui/restore-disk-image-dialog.ui.h:2
 msgid "_Image to restore"
 msgstr "ãããããããããã(_I)"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:3
+#: ../data/ui/restore-disk-image-dialog.ui.h:2
 msgid "Select Disk Image to restore"
 msgstr "ãããããããããããããããéæ"
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:4
+#: ../data/ui/restore-disk-image-dialog.ui.h:3
+#: ../src/disks/gdurestorediskimagedialog.c:498
 msgid "Copying data to device..."
 msgstr "ããããããããããããä..."
 
-#: ../data/ui/restore-disk-image-dialog.ui.h:5
+#: ../data/ui/restore-disk-image-dialog.ui.h:4
 msgid "_Start Restoring..."
 msgstr "ãããããéå(_S)..."
 
 #: ../data/ui/smart-dialog.ui.h:1
 #, fuzzy
+#| msgid "SM_ART Data"
+msgid "SMART Data"
+msgstr "SMART ããããèç..."
+
+#: ../data/ui/smart-dialog.ui.h:2
+#, fuzzy
 #| msgid "_Cancel Self-test"
 msgid "_Start Self-test..."
 msgstr "ãããããããããããã(_C)"
 
-#: ../data/ui/smart-dialog.ui.h:2
+#: ../data/ui/smart-dialog.ui.h:3
 #, fuzzy
 #| msgid "Self-tests:"
 msgid "_Stop Self-test"
 msgstr "ãããããã:"
 
-#: ../data/ui/smart-dialog.ui.h:3
+#: ../data/ui/smart-dialog.ui.h:4
 #, fuzzy
 #| msgid "Powered On:"
 msgid "Powered On"
 msgstr "ããããã:"
 
-#: ../data/ui/smart-dialog.ui.h:4
+#: ../data/ui/smart-dialog.ui.h:5
 #, fuzzy
 #| msgid "Updated:"
 msgid "Updated"
@@ -725,227 +892,266 @@ msgstr "ææ:"
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../data/ui/smart-dialog.ui.h:5 ../src/palimpsest/gduatasmartdialog.c:300
-#: ../src/palimpsest/gduatasmartdialog.c:519
+#: ../data/ui/smart-dialog.ui.h:6 ../src/disks/gduatasmartdialog.c:284
+#: ../src/disks/gduatasmartdialog.c:503
 msgid "Temperature"
 msgstr "Temperature"
 
-#: ../data/ui/smart-dialog.ui.h:6
+#: ../data/ui/smart-dialog.ui.h:7
 msgid "Self-test Result"
 msgstr "ããããããçæ"
 
-#: ../data/ui/smart-dialog.ui.h:7
+#: ../data/ui/smart-dialog.ui.h:8
 #, fuzzy
 #| msgid "Self Assessment:"
 msgid "Self-assessment"
 msgstr "èåèä:"
 
-#: ../data/ui/smart-dialog.ui.h:8
+#: ../data/ui/smart-dialog.ui.h:9
 msgid "Overall Assessment"
 msgstr "çåèä"
 
+#: ../data/ui/smart-dialog.ui.h:10
+#, fuzzy
+#| msgid "<b>SMART _Attributes</b>"
+msgid "SMART _Attributes"
+msgstr "<b>SMART åæ(_A)</b>"
+
 #. Translators: This string is used as the column title in the treeview for the value
-#: ../data/ui/smart-dialog.ui.h:9 ../src/palimpsest/gduatasmartdialog.c:1620
+#: ../data/ui/smart-dialog.ui.h:11 ../src/disks/gduatasmartdialog.c:1491
 msgid "Value"
 msgstr "å"
 
-#. How often the attribute is updated. The two possible values are 'Every time data is collected (online)' 
and 'Only during off-line activities (Not Online)'
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../data/ui/smart-dialog.ui.h:11 ../src/palimpsest/gduatasmartdialog.c:865
-#, fuzzy
-#| msgid "Updated:"
-msgid "Updates"
-msgstr "ææ:"
-
-#. Translators: Used in the tooltip for a SMART attribute
-#: ../data/ui/smart-dialog.ui.h:12 ../src/palimpsest/gduatasmartdialog.c:863
+#: ../data/ui/smart-dialog.ui.h:12
 #, fuzzy
 #| msgid "Type:"
 msgid "Type"
 msgstr "ããã:"
 
 #: ../data/ui/smart-dialog.ui.h:13
-msgid "Normalized"
-msgstr "æèåå"
+#, fuzzy
+#| msgid "Encryption"
+msgid "Description"
+msgstr "æåå"
 
 #: ../data/ui/smart-dialog.ui.h:14
-msgid "<b>SMART _Attributes</b>"
-msgstr "<b>SMART åæ(_A)</b>"
-
-#: ../data/ui/smart-dialog.ui.h:15
 msgid "Short"
 msgstr ""
 
-#: ../data/ui/smart-dialog.ui.h:16
+#: ../data/ui/smart-dialog.ui.h:15
 msgid "Extended"
 msgstr "æå"
 
-#: ../data/ui/smart-dialog.ui.h:17
+#: ../data/ui/smart-dialog.ui.h:16
 #, fuzzy
 #| msgid "Cancel"
 msgid "Conveyance"
 msgstr "ããããã"
 
 #: ../data/ui/unlock-device-dialog.ui.h:1
-msgid "<big>Enter passphrase to unlock</big>"
-msgstr ""
+#, fuzzy
+#| msgid "Enter passphrase used to protect the data"
+msgid "Enter passphrase to unlock"
+msgstr "ããããäèããããäããããããããååãããããã"
 
 #: ../data/ui/unlock-device-dialog.ui.h:4
 msgid "_Unlock"
 msgstr "ãããèé(_U)"
 
+#: ../src/disk-image-mounter/main.c:44
+msgid "An error occurred"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:65
+#, fuzzy
+#| msgid "Error formatting volume"
+msgid "Allow writing to the image"
+msgstr "ããããããããããããäãããããççãããã"
+
+#: ../src/disk-image-mounter/main.c:80
+#, fuzzy
+msgid "Select Disk Image(s) to Mount"
+msgstr "æçãããããããããããéãããããã"
+
+#: ../src/disk-image-mounter/main.c:84
+msgid "_Mount"
+msgstr ""
+
+#. Add a RO check button that defaults to RO
+#: ../src/disk-image-mounter/main.c:90
+msgid "Set up _read-only mount"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:91
+msgid "If checked, the mount will be read-only. This is useful if you don't want the underlying disk image 
to be modified"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:133
+#, c-format
+msgid "Error connecting to udisks daemon: %s (%s, %d)"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:141
+msgid "Attach and mount one or more disk image files."
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:189
+#, c-format
+msgid "Cannot open `%s' - maybe the volume isn't mounted?"
+msgstr ""
+
+#: ../src/disk-image-mounter/main.c:196
+#, fuzzy, c-format
+#| msgid "Error mounting device"
+msgid "Error opening `%s': %m"
+msgstr "ãããããããããäãããããççãããã"
+
+#: ../src/disk-image-mounter/main.c:217
+#, fuzzy, c-format
+#| msgid "Error detaching drive"
+msgid "Error attaching disk image: %s (%s, %d)"
+msgstr "ãããããåãåãäãããããççãããã"
+
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:143
+#: ../src/disks/gduatasmartdialog.c:127
 msgid "Read Error Rate"
 msgstr "Read Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:144
-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"
-msgstr ""
-"ããããããrawããããèãåãéãããããéåãããåã0ãããååãããã"
-"ãèéãããèãæããããããããããåéãããããã"
+#: ../src/disks/gduatasmartdialog.c:128
+msgid "Frequency of errors while reading raw data from the disk. A non-zero value indicates a problem with 
either the disk surface or read/write heads"
+msgstr "ããããããrawããããèãåãéãããããéåãããåã0ãããååãããããèéãããèãæããããããããããåéãããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:153
+#: ../src/disks/gduatasmartdialog.c:137
 msgid "Throughput Performance"
 msgstr "Throughput Performance"
 
-#: ../src/palimpsest/gduatasmartdialog.c:154
+#: ../src/disks/gduatasmartdialog.c:138
 msgid "Average efficiency of the disk"
 msgstr "ãããããååçãåç"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:161
+#: ../src/disks/gduatasmartdialog.c:145
 msgid "Spinup Time"
 msgstr "Spinup Time"
 
-#: ../src/palimpsest/gduatasmartdialog.c:162
+#: ../src/disks/gduatasmartdialog.c:146
 msgid "Time needed to spin up the disk"
 msgstr "ããããããããããããåèãæéããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:169
+#: ../src/disks/gduatasmartdialog.c:153
 msgid "Start/Stop Count"
 msgstr "Start/Stop Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:170
+#: ../src/disks/gduatasmartdialog.c:154
 msgid "Number of spindle start/stop cycles"
 msgstr "ãããããããããåè/åæããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:177
+#: ../src/disks/gduatasmartdialog.c:161
 msgid "Reallocated Sector Count"
 msgstr "Reallocated Sector Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:178
-msgid ""
-"Count of remapped sectors. When the hard drive finds a read/write/"
-"verification error, it marks the sector as \"reallocated\" and transfers "
-"data to a special reserved area (spare area)"
-msgstr ""
-"ããããããåçãéçãããããããæããããããããããããããããããã"
-"ãããäãããããçèãããããããããããããããããããããããããã"
-"ããããããããçãäçéå(ããããéå)ãçåããããã"
+#: ../src/disks/gduatasmartdialog.c:162
+msgid "Count of remapped sectors. When the hard drive finds a read/write/verification error, it marks the 
sector as \"reallocated\" and transfers data to a special reserved area (spare area)"
+msgstr 
"ããããããåçãéçãããããããæããããããããããããããããããããããäãããããçèããããããããããããããããããããããããããããããããããçãäçéå(ããããéå)ãçåããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:187
+#: ../src/disks/gduatasmartdialog.c:171
 msgid "Read Channel Margin"
 msgstr "Read Channel Margin"
 
-#: ../src/palimpsest/gduatasmartdialog.c:188
+#: ../src/disks/gduatasmartdialog.c:172
 msgid "Margin of a channel while reading data."
 msgstr "ãããèãèãæãããããããããããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:195
+#: ../src/disks/gduatasmartdialog.c:179
 msgid "Seek Error Rate"
 msgstr "Seek Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:196
+#: ../src/disks/gduatasmartdialog.c:180
 msgid "Frequency of errors while positioning"
 msgstr "äçæããéãããããéåããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:203
+#: ../src/disks/gduatasmartdialog.c:187
 msgid "Seek Timer Performance"
 msgstr "Seek Timer Performance"
 
-#: ../src/palimpsest/gduatasmartdialog.c:204
+#: ../src/disks/gduatasmartdialog.c:188
 msgid "Average efficiency of operations while positioning"
 msgstr "ãããçåããããããããããããæéãåå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:211
-#: ../src/palimpsest/gduatasmartdialog.c:536
+#: ../src/disks/gduatasmartdialog.c:195 ../src/disks/gduatasmartdialog.c:520
 msgid "Power-On Hours"
 msgstr "Power-On Hours"
 
-#: ../src/palimpsest/gduatasmartdialog.c:212
-#: ../src/palimpsest/gduatasmartdialog.c:537
+#: ../src/disks/gduatasmartdialog.c:196 ../src/disks/gduatasmartdialog.c:521
 msgid "Number of hours elapsed in the power-on state"
 msgstr "ããããããããããããããããçéæéããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:219
+#: ../src/disks/gduatasmartdialog.c:203
 msgid "Spinup Retry Count"
 msgstr "Spinup Retry Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:220
+#: ../src/disks/gduatasmartdialog.c:204
 msgid "Number of retry attempts to spin up"
 msgstr "ãããããããèãããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:227
+#: ../src/disks/gduatasmartdialog.c:211
 msgid "Calibration Retry Count"
 msgstr "Calibration Retry Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:228
+#: ../src/disks/gduatasmartdialog.c:212
 msgid "Number of attempts to calibrate the device"
 msgstr "ãããããããããããããããèãããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:235
+#: ../src/disks/gduatasmartdialog.c:219
 msgid "Power Cycle Count"
 msgstr "Power Cycle Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:236
+#: ../src/disks/gduatasmartdialog.c:220
 msgid "Number of power-on events"
 msgstr "ãããããããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:243
+#: ../src/disks/gduatasmartdialog.c:227
 msgid "Soft read error rate"
 msgstr "Soft read error rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:245
+#: ../src/disks/gduatasmartdialog.c:229
 #, fuzzy
 #| msgid "Frequency of 'program' errors while reading from the disk"
 msgid "Frequency of errors while reading from the disk"
@@ -954,501 +1160,406 @@ msgstr "ãããããããèãèããéãççãã 'ããããã'
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:252
+#: ../src/disks/gduatasmartdialog.c:236
 msgid "Reported Uncorrectable Errors"
 msgstr "Reported Uncorrectable Errors"
 
-#: ../src/palimpsest/gduatasmartdialog.c:253
+#: ../src/disks/gduatasmartdialog.c:237
 msgid "Number of errors that could not be recovered using hardware ECC"
 msgstr "ãããããã ECC ãåçãããååããããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:260
+#: ../src/disks/gduatasmartdialog.c:244
 msgid "High Fly Writes"
 msgstr "High Fly Writes"
 
-#: ../src/palimpsest/gduatasmartdialog.c:261
-msgid ""
-"Number of times a recording head is flying outside its normal operating range"
+#: ../src/disks/gduatasmartdialog.c:245
+msgid "Number of times a recording head is flying outside its normal operating range"
 msgstr "èéããããéåãåäéåãããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:268
+#: ../src/disks/gduatasmartdialog.c:252
 msgid "Airflow Temperature"
 msgstr "Airflow Temperature"
 
-#: ../src/palimpsest/gduatasmartdialog.c:269
+#: ../src/disks/gduatasmartdialog.c:253
 msgid "Airflow temperature of the drive"
 msgstr "ããããããããããæå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:276
-#: ../src/palimpsest/gduatasmartdialog.c:446
+#: ../src/disks/gduatasmartdialog.c:260 ../src/disks/gduatasmartdialog.c:430
 msgid "G-sense Error Rate"
 msgstr "G-sense Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:277
+#: ../src/disks/gduatasmartdialog.c:261
 msgid "Frequency of mistakes as a result of impact loads"
 msgstr "åéãããèæããããççãããããããããåæãéå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:284
-#: ../src/palimpsest/gduatasmartdialog.c:503
+#: ../src/disks/gduatasmartdialog.c:268 ../src/disks/gduatasmartdialog.c:487
 msgid "Power-off Retract Count"
 msgstr "Power-off Retract Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:285
+#: ../src/disks/gduatasmartdialog.c:269
 msgid "Number of power-off or emergency retract cycles"
 msgstr "ããããããããçæééããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:292
-#: ../src/palimpsest/gduatasmartdialog.c:479
+#: ../src/disks/gduatasmartdialog.c:276 ../src/disks/gduatasmartdialog.c:463
 msgid "Load/Unload Cycle Count"
 msgstr "Load/Unload Cycle Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:293
+#: ../src/disks/gduatasmartdialog.c:277
 msgid "Number of cycles into landing zone position"
 msgstr "ããããããããããäçãééããåæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:301
+#: ../src/disks/gduatasmartdialog.c:285
 msgid "Current internal temperature of the drive"
 msgstr "çåãåéãæå(ææ)"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:308
+#: ../src/disks/gduatasmartdialog.c:292
 msgid "Hardware ECC Recovered"
 msgstr "Hardware ECC Recovered"
 
-#: ../src/palimpsest/gduatasmartdialog.c:309
+#: ../src/disks/gduatasmartdialog.c:293
 msgid "Number of ECC on-the-fly errors"
 msgstr "ECCãæçããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:316
+#: ../src/disks/gduatasmartdialog.c:300
 msgid "Reallocation Count"
 msgstr "Reallocation Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:317
-msgid ""
-"Number of remapping operations. The raw value of this attribute shows the "
-"total number of (successful and unsuccessful) attempts to transfer data from "
-"reallocated sectors to a spare area"
-msgstr ""
-"äæåçãèããåæãããããåæãçãåããäæããããããçãéåããã"
-"ããçåãèãã (æå/åæãäæã) çæãèãããããã"
+#: ../src/disks/gduatasmartdialog.c:301
+msgid "Number of remapping operations. The raw value of this attribute shows the total number of (successful 
and unsuccessful) attempts to transfer data from reallocated sectors to a spare area"
+msgstr "äæåçãèããåæãããããåæãçãåããäæããããããçãéåãããããçåãèãã (æå/åæãäæã) çæãèãããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:327
+#: ../src/disks/gduatasmartdialog.c:311
 msgid "Current Pending Sector Count"
 msgstr "Current Pending Sector Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:328
-msgid ""
-"Number of sectors waiting to be remapped. If the sector waiting to be "
-"remapped is subsequently written or read successfully, this value is "
-"decreased and the sector is not remapped. Read errors on the sector will not "
-"remap the sector, it will only be remapped on a failed write attempt"
-msgstr ""
-"äæåçåãããããããæãããäæåçåãããããããçæçãèãèããã"
-"ãæãèããæåããååãããåãæããããããäæåçãããããããããã"
-"ãèãåããããããããããäæåçãããããæãèããåæããååããäæ"
-"åçããããã"
+#: ../src/disks/gduatasmartdialog.c:312
+msgid "Number of sectors waiting to be remapped. If the sector waiting to be remapped is subsequently 
written or read successfully, this value is decreased and the sector is not remapped. Read errors on the 
sector will not remap the sector, it will only be remapped on a failed write attempt"
+msgstr 
"äæåçåãããããããæãããäæåçåãããããããçæçãèãèããããæãèããæåããååãããåãæããããããäæåçãããããããããããèãåããããããããããäæåçãããããæãèããåæããååããäæåçããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:339
+#: ../src/disks/gduatasmartdialog.c:323
 msgid "Uncorrectable Sector Count"
 msgstr "Uncorrectable Sector Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:340
-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 "
-"and/or problems in the mechanical subsystem"
-msgstr ""
-"ãããããèãæããéãççããååäåèãããããçæãããããåæãåã"
-"äæããååããããããèéãææçãéåãããããããäæãäååãççã"
-"ããããããèãããããã"
+#: ../src/disks/gduatasmartdialog.c:324
+msgid "The total number of uncorrectable errors when reading/writing a sector. A rise in the value of this 
attribute indicates defects of the disk surface and/or problems in the mechanical subsystem"
+msgstr "ãããããèãæããéãççããååäåèãããããçæãããããåæãåãäæããååããããããèéãææçãéåãããããããäæãäååãççãããããããèãããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:349
+#: ../src/disks/gduatasmartdialog.c:333
 msgid "UDMA CRC Error Rate"
 msgstr "UDMA CRC Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:350
+#: ../src/disks/gduatasmartdialog.c:334
 msgid "Number of CRC errors during UDMA mode"
 msgstr "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:341
 msgid "Write Error Rate"
 msgstr "Write Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:358
-msgid ""
-"Number of errors while writing to disk (or) multi-zone error rate (or) "
-"flying-height"
-msgstr ""
-"ããããæãèãæããããççåæ (ããã) multi-zone errorãççç (ãã"
-"ã) ãããèé"
+#: ../src/disks/gduatasmartdialog.c:342
+msgid "Number of errors while writing to disk (or) multi-zone error rate (or) flying-height"
+msgstr "ããããæãèãæããããççåæ (ããã) multi-zone errorãççç (ããã) ãããèé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:365
+#: ../src/disks/gduatasmartdialog.c:349
 msgid "Soft Read Error Rate"
 msgstr "Soft Read Error Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:366
+#: ../src/disks/gduatasmartdialog.c:350
 msgid "Number of off-track errors"
 msgstr "ãããããããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:373
+#: ../src/disks/gduatasmartdialog.c:357
 msgid "Data Address Mark Errors"
 msgstr "Data Address Mark Errors"
 
-#: ../src/palimpsest/gduatasmartdialog.c:374
+#: ../src/disks/gduatasmartdialog.c:358
 msgid "Number of Data Address Mark (DAM) errors (or) vendor-specific"
 msgstr "ãããããããããã (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:365
 msgid "Run Out Cancel"
 msgstr "Run Out Cancel"
 
-#: ../src/palimpsest/gduatasmartdialog.c:382
+#: ../src/disks/gduatasmartdialog.c:366
 msgid "Number of ECC errors"
 msgstr "ECC ããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:389
+#: ../src/disks/gduatasmartdialog.c:373
 msgid "Soft ECC correction"
 msgstr "Soft ECC correction"
 
-#: ../src/palimpsest/gduatasmartdialog.c:390
+#: ../src/disks/gduatasmartdialog.c:374
 msgid "Number of errors corrected by software ECC"
 msgstr "ãããããã ECC ãããèæãããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:397
+#: ../src/disks/gduatasmartdialog.c:381
 msgid "Thermal Asperity Rate"
 msgstr "Thermal Asperity Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:398
+#: ../src/disks/gduatasmartdialog.c:382
 msgid "Number of Thermal Asperity Rate errors"
 msgstr "ãããããããããããçãããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:405
+#: ../src/disks/gduatasmartdialog.c:389
 msgid "Flying Height"
 msgstr "Flying Height"
 
-#: ../src/palimpsest/gduatasmartdialog.c:406
+#: ../src/disks/gduatasmartdialog.c:390
 msgid "Height of heads above the disk surface"
 msgstr "ããããèéäãããããéåãã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:413
+#: ../src/disks/gduatasmartdialog.c:397
 msgid "Spin High Current"
 msgstr "Spin High Current"
 
-#: ../src/palimpsest/gduatasmartdialog.c:414
+#: ../src/disks/gduatasmartdialog.c:398
 msgid "Amount of high current used to spin up the drive"
 msgstr "ãããããããããããæãäçããééæéãã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:421
+#: ../src/disks/gduatasmartdialog.c:405
 msgid "Spin Buzz"
 msgstr "Spin Buzz"
 
-#: ../src/palimpsest/gduatasmartdialog.c:422
+#: ../src/disks/gduatasmartdialog.c:406
 msgid "Number of buzz routines to spin up the drive"
 msgstr "ãããããããããããæããããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:429
+#: ../src/disks/gduatasmartdialog.c:413
 msgid "Offline Seek Performance"
 msgstr "Offline Seek Performance"
 
-#: ../src/palimpsest/gduatasmartdialog.c:430
+#: ../src/disks/gduatasmartdialog.c:414
 msgid "Drive's seek performance during offline operations"
 msgstr "ãããããåäæããããããããããããããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:437
+#: ../src/disks/gduatasmartdialog.c:421
 msgid "Disk Shift"
 msgstr "Disk Shift"
 
-#: ../src/palimpsest/gduatasmartdialog.c:438
-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/disks/gduatasmartdialog.c:422
+msgid "Shift of disk is possible as a result of strong shock loading in the store, as a result of falling 
(or) temperature"
+msgstr "ããããããããããããããäåäãèäãééãæåæäãããåããèèãããããååãçããããããããã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:447
-msgid ""
-"Number of errors as a result of impact loads as detected by a shock sensor"
-msgstr ""
-"ããããããããããããæçããããåéãããèæããããççããããããå"
-"æ"
+#: ../src/disks/gduatasmartdialog.c:431
+msgid "Number of errors as a result of impact loads as detected by a shock sensor"
+msgstr "ããããããããããããæçããããåéãããèæããããççããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:454
+#: ../src/disks/gduatasmartdialog.c:438
 msgid "Loaded Hours"
 msgstr "Loaded Hours"
 
-#: ../src/palimpsest/gduatasmartdialog.c:455
+#: ../src/disks/gduatasmartdialog.c:439
 msgid "Number of hours in general operational state"
 msgstr "ããããããããããããããããçéæéããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:462
+#: ../src/disks/gduatasmartdialog.c:446
 msgid "Load/Unload Retry Count"
 msgstr "Load/Unload Retry Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:463
-msgid ""
-"Loading on drive caused by numerous recurrences of operations, like reading, "
-"recording, positioning of heads, etc"
-msgstr ""
-"ãããããããããããããèéãããããçåãããããããããããååèãã"
-"ããããèéãããããã"
+#: ../src/disks/gduatasmartdialog.c:447
+msgid "Loading on drive caused by numerous recurrences of operations, like reading, recording, positioning 
of heads, etc"
+msgstr "ãããããããããããããèéãããããçåãããããããããããååèããããããèéãããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:471
+#: ../src/disks/gduatasmartdialog.c:455
 msgid "Load Friction"
 msgstr "Load Friction"
 
-#: ../src/palimpsest/gduatasmartdialog.c:472
+#: ../src/disks/gduatasmartdialog.c:456
 msgid "Load on drive caused by friction in mechanical parts of the store"
 msgstr "ãããããããããäåäãææçãããããçãããããèéãããããã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:480
+#: ../src/disks/gduatasmartdialog.c:464
 msgid "Total number of load cycles"
 msgstr "ãããããããããåè/åæããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:487
+#: ../src/disks/gduatasmartdialog.c:471
 msgid "Load-in Time"
 msgstr "Load-in Time"
 
-#: ../src/palimpsest/gduatasmartdialog.c:488
+#: ../src/disks/gduatasmartdialog.c:472
 msgid "General time for loading in a drive"
 msgstr "ãããããèãèãããããååæéããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:495
+#: ../src/disks/gduatasmartdialog.c:479
 msgid "Torque Amplification Count"
 msgstr "Torque Amplification Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:496
+#: ../src/disks/gduatasmartdialog.c:480
 msgid "Quantity efforts of the rotating moment of a drive"
 msgstr "ãããããåèäèæãèèåæãã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:504
+#: ../src/disks/gduatasmartdialog.c:488
 msgid "Number of power-off retract events"
 msgstr "éæãããããããããããççããåæãã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:511
+#: ../src/disks/gduatasmartdialog.c:495
 msgid "GMR Head Amplitude"
 msgstr "GMR Head Amplitude"
 
-#: ../src/palimpsest/gduatasmartdialog.c:512
+#: ../src/disks/gduatasmartdialog.c:496
 msgid "Amplitude of heads trembling (GMR-head) in running mode"
 msgstr "åäãããæãããããæåãæå (GMRããã)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:520
+#: ../src/disks/gduatasmartdialog.c:504
 msgid "Temperature of the drive"
 msgstr "ãããããæå"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:527
+#: ../src/disks/gduatasmartdialog.c:511
 msgid "Endurance Remaining"
 msgstr "Endurance Remaining"
 
-#: ../src/palimpsest/gduatasmartdialog.c:528
-msgid ""
-"Number of physical erase cycles completed on the drive as a percentage of "
-"the maximum physical erase cycles the drive supports"
-msgstr ""
-"åäããçççæåãããããæãããããããããããããããæåãçççæå"
-"ãããããæèããããããããããã"
+#: ../src/disks/gduatasmartdialog.c:512
+msgid "Number of physical erase cycles completed on the drive as a percentage of the maximum physical erase 
cycles the drive supports"
+msgstr "åäããçççæåãããããæãããããããããããããããæåãçççæåãããããæèããããããããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:544
+#: ../src/disks/gduatasmartdialog.c:528
 msgid "Uncorrectable ECC Count"
 msgstr "Uncorrectable ECC Count"
 
-#: ../src/palimpsest/gduatasmartdialog.c:545
+#: ../src/disks/gduatasmartdialog.c:529
 msgid "Number of uncorrectable ECC errors"
 msgstr "ECCãæçããããããåæ"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:552
+#: ../src/disks/gduatasmartdialog.c:536
 msgid "Good Block Rate"
 msgstr "Good Block Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:553
-msgid ""
-"Number of available reserved blocks as a percentage of the total number of "
-"reserved blocks"
-msgstr ""
-"åçåèããããããããããæããäçãããããçæãæèããããããããã"
-"ãã"
+#: ../src/disks/gduatasmartdialog.c:537
+msgid "Number of available reserved blocks as a percentage of the total number of reserved blocks"
+msgstr "åçåèããããããããããæããäçãããããçæãæèããããããããããã"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:561
+#: ../src/disks/gduatasmartdialog.c:545
 msgid "Head Flying Hours"
 msgstr "Head Flying Hours"
 
-#: ../src/palimpsest/gduatasmartdialog.c:562
+#: ../src/disks/gduatasmartdialog.c:546
 msgid "Time while head is positioning"
 msgstr "ããããäçæããããããæé"
 
 #. Translators: SMART attribute, see http://smartmontools.sourceforge.net/doc.html
 #. * or the next string for a longer explanation.
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:569
+#: ../src/disks/gduatasmartdialog.c:553
 msgid "Read Error Retry Rate"
 msgstr "Read Error Retry Rate"
 
-#: ../src/palimpsest/gduatasmartdialog.c:570
+#: ../src/disks/gduatasmartdialog.c:554
 msgid "Number of errors while reading from a disk"
 msgstr "ããããããèãåããéãççãããããæ"
 
-#: ../src/palimpsest/gduatasmartdialog.c:630
-#: ../src/palimpsest/gduatasmartdialog.c:820
+#: ../src/disks/gduatasmartdialog.c:614
 #, c-format
 msgid "No description for attribute %d"
 msgstr "åæ %d ãèæããããããã"
 
 #. Translators: Shown in the treeview for a failing attribute
-#: ../src/palimpsest/gduatasmartdialog.c:681
+#: ../src/disks/gduatasmartdialog.c:665
 msgid "FAILING"
 msgstr "æéä"
 
 #. Translators: Shown in the treeview for an attribute that failed in the past
-#: ../src/palimpsest/gduatasmartdialog.c:690
+#: ../src/disks/gduatasmartdialog.c:674
 msgid "Failed in the past"
 msgstr "Failed in the past"
 
-#: ../src/palimpsest/gduatasmartdialog.c:694
+#: ../src/disks/gduatasmartdialog.c:678
 msgid "OK"
 msgstr ""
 
-#. Translators: Used for a time-based unit that exceed one year
-#: ../src/palimpsest/gduatasmartdialog.c:711
-#, fuzzy, c-format
-#| msgid "%.1f years"
-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
-#, fuzzy, c-format
-#| msgid "%.1f days"
-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
-#, fuzzy, c-format
-#| msgid "%.1f hours"
-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
-#, fuzzy, c-format
-#| msgid "%.1f minutes"
-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
-#, fuzzy, c-format
-#| msgid "%.1f seconds"
-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
-#, fuzzy, c-format
-#| msgid "%.1f seconds"
-msgid "%.1f msec"
-msgid_plural "%.1f msecs"
-msgstr[0] "%.1f ç"
-
-#: ../src/palimpsest/gduatasmartdialog.c:764
+#: ../src/disks/gduatasmartdialog.c:705
 #, c-format
 msgid "%d sector"
 msgid_plural "%d sectors"
@@ -1461,8 +1572,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:717 ../src/disks/gduatasmartdialog.c:929
 #, c-format
 msgid "%.0f C / %.0f F"
 msgstr "%.0f C / %.0f F"
@@ -1470,121 +1580,78 @@ 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:728
 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
-#, fuzzy
-#| msgid "Failure is a sign of imminent disk failure (Pre-Fail)"
-msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
-msgstr ""
-"æéæçããèãåæããããããæéãããããããããäæãã(Pre-Fail)"
-
-#. Translators: Used in the tooltip for a row in the attribute treeview - please keep
-#. * "(Old-Age)" in English
+#. 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: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
-#.
-#: ../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
-#, fuzzy
-#| msgid "Encryption"
-msgid "Description"
-msgstr "æåå"
-
-#: ../src/palimpsest/gduatasmartdialog.c:908
+#: ../src/disks/gduatasmartdialog.c:774
 #, c-format
-msgid "%d <span size=\"small\">(Worst:%d, Threshold: %d)</span>"
+msgid "%s <span size=\"small\">(Normalized: %d, Threshold: %d, Worst: %d)</span>"
 msgstr ""
 
 #. Translators: Please keep "(Pre-Fail)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:918
-msgid ""
-"Failure is a sign the disk will fail within 24 hours <span size=\"small\">"
-"(Pre-Fail)</span>"
+#: ../src/disks/gduatasmartdialog.c:784
+msgid "Failure is a sign the disk will fail within 24 hours <span size=\"small\">(Pre-Fail)</span>"
 msgstr ""
 
 #. Translators: Please keep "(Old-Age)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:924
-msgid ""
-"Failure is a sign the disk exceeded its intended design life period <span "
-"size=\"small\">(Old-Age)</span>"
+#: ../src/disks/gduatasmartdialog.c:790
+msgid "Failure is a sign the disk exceeded its intended design life period <span 
size=\"small\">(Old-Age)</span>"
 msgstr ""
 
 #. Translators: Please keep "(Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:931
+#: ../src/disks/gduatasmartdialog.c:797
 #, fuzzy
 #| msgid "Every time data is collected (Online)"
-msgid "Every time data is collected <span size=\"small\">(Online)</span>"
+msgid "Updated every time data is collected <span size=\"small\">(Online)</span>"
 msgstr "åãããããåé(ããããã)"
 
 #. Translators: Please keep "(Not Online)" in English
 #.
-#: ../src/palimpsest/gduatasmartdialog.c:937
+#: ../src/disks/gduatasmartdialog.c:803
 #, fuzzy
 #| msgid "Only during off-line activities (Not Online)"
-msgid ""
-"Only during off-line activities <span size=\"small\">(Not Online)</span>"
+msgid "Updated only during off-line activities <span size=\"small\">(Not Online)</span>"
 msgstr "ãããããæåæãã(éããããã)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:964
+#: ../src/disks/gduatasmartdialog.c:834
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
 msgid "Last self-test completed successfully"
 msgstr "ææãããããããåä OK"
 
-#: ../src/palimpsest/gduatasmartdialog.c:968
+#: ../src/disks/gduatasmartdialog.c:838
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
 msgid "Last self-test was aborted"
 msgstr "ææãããããããåä OK"
 
-#: ../src/palimpsest/gduatasmartdialog.c:972
+#: ../src/disks/gduatasmartdialog.c:842
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
 msgid "Last self-test was interrupted"
 msgstr "ææãããããããåä OK"
 
-#: ../src/palimpsest/gduatasmartdialog.c:976
+#: ../src/disks/gduatasmartdialog.c:846
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
 msgid "Last self-test did not complete"
 msgstr "ææãããããããåä OK"
 
-#: ../src/palimpsest/gduatasmartdialog.c:980
+#: ../src/disks/gduatasmartdialog.c:850
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
@@ -1592,7 +1659,7 @@ msgid "Last self-test failed"
 msgstr "ææãããããããåä OK"
 
 #. Translators: shown when the last self-test failed and the problem is with the electrical subsystem
-#: ../src/palimpsest/gduatasmartdialog.c:985
+#: ../src/disks/gduatasmartdialog.c:855
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
@@ -1600,7 +1667,7 @@ msgid "Last self-test failed (electrical)"
 msgstr "ææãããããããåä OK"
 
 #. Translators: shown when the last self-test failed and the problem is with the servo subsystem - see 
http://en.wikipedia.org/wiki/Servomechanism
-#: ../src/palimpsest/gduatasmartdialog.c:990
+#: ../src/disks/gduatasmartdialog.c:860
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
@@ -1608,7 +1675,7 @@ msgid "Last self-test failed (servo)"
 msgstr "ææãããããããåä OK"
 
 #. Translators: shown when the last self-test failed and the problem is with the reading subsystem -
-#: ../src/palimpsest/gduatasmartdialog.c:995
+#: ../src/disks/gduatasmartdialog.c:865
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
@@ -1616,7 +1683,7 @@ msgid "Last self-test failed (read)"
 msgstr "ææãããããããåä OK"
 
 #. Translators: shown when the last self-test failed and the disk is suspected of having handling damage 
(e.g. physical damage to the hard disk)
-#: ../src/palimpsest/gduatasmartdialog.c:1000
+#: ../src/disks/gduatasmartdialog.c:870
 #, fuzzy
 #| msgid "Last self-test completed OK"
 msgctxt "smart-self-test-result"
@@ -1624,7 +1691,7 @@ msgid "Last self-test failed (handling)"
 msgstr "ææãããããããåä OK"
 
 #. Translators: shown when a self-test is in progress. The first %d is the percentage of the test remaining.
-#: ../src/palimpsest/gduatasmartdialog.c:1005
+#: ../src/disks/gduatasmartdialog.c:875
 #, fuzzy, c-format
 #| msgid "Self-test is in progress"
 msgctxt "smart-self-test-result"
@@ -1632,142 +1699,315 @@ msgid "Self-test in progress â %d%% remaining"
 msgstr "ãããããããåèäãã"
 
 #. Translators: Shown when a self-test is not unknown. The %s is the result-code from the API code.
-#: ../src/palimpsest/gduatasmartdialog.c:1012
+#: ../src/disks/gduatasmartdialog.c:882
 #, fuzzy, c-format
 #| msgid "Unknown (%s)"
 msgctxt "smart-self-test-result"
 msgid "Unknown (%s)"
 msgstr "äæ (%s)"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1034
+#: ../src/disks/gduatasmartdialog.c:905
 #, fuzzy, c-format
 #| msgid "%s Data"
 msgid "%s ago"
 msgstr "ããã %s"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1091
+#: ../src/disks/gduatasmartdialog.c:963
 #, fuzzy
 #| msgid "SMART not supported"
 msgid "SMART is not supported"
 msgstr "SMART ãããããããããããã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1097
+#: ../src/disks/gduatasmartdialog.c:969
 #, fuzzy
 msgid "SMART is not enabled"
 msgstr "SMART ãããããããããããåãããããã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1109
-#, c-format
-msgid "Self-test in progress â %d%% remaining"
+#: ../src/disks/gduatasmartdialog.c:981
+#, fuzzy
+#| msgid "Self-test in progress â %d%% remaining"
+msgid "Self-test in progress"
 msgstr "ãããããããåèä â æã %d%%"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1123
-#: ../src/palimpsest/gduatasmartdialog.c:1132
+#: ../src/disks/gduatasmartdialog.c:994 ../src/disks/gduatasmartdialog.c:1003
 msgid "DISK IS LIKELY TO FAIL SOON"
 msgstr ""
 
-#: ../src/palimpsest/gduatasmartdialog.c:1155
+#: ../src/disks/gduatasmartdialog.c:1026
 msgid "SELF-TEST FAILED"
 msgstr ""
 
-#: ../src/palimpsest/gduatasmartdialog.c:1164
+#: ../src/disks/gduatasmartdialog.c:1035
 #, c-format
 msgid "Disk is OK, one failing attribute is failing"
 msgid_plural "Disk is OK, %d attributes are failing"
 msgstr[0] ""
 
-#: ../src/palimpsest/gduatasmartdialog.c:1175
+#: ../src/disks/gduatasmartdialog.c:1046
 #, fuzzy, c-format
 #| msgid "Disk has a few bad sectors"
 msgid "Disk is OK, one bad sector"
 msgid_plural "Disk is OK, %d bad sectors"
 msgstr[0] "ãããããããããæåããããããããããããã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1186
+#: ../src/disks/gduatasmartdialog.c:1057
 #, c-format
 msgid "Disk is OK, one attribute failed in the past"
 msgid_plural "Disk is OK, %d attributes failed in the past"
 msgstr[0] ""
 
+#. Otherwise, it's all honky dory
+#: ../src/disks/gduatasmartdialog.c:1066
+#, fuzzy
+#| msgid "Disk Drives"
+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:1080
 #, fuzzy, c-format
 #| msgid "%s (%s bytes)"
 msgid "%s (%s)"
 msgstr "%s (%s ããã)"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1364
+#: ../src/disks/gduatasmartdialog.c:1235
 #, fuzzy
 #| msgid "Threshold:"
 msgid "Threshold exceeded"
 msgstr "ãããå:"
 
 #. Translators: XXX
-#: ../src/palimpsest/gduatasmartdialog.c:1369
+#: ../src/disks/gduatasmartdialog.c:1240
 msgid "Threshold not exceeded"
 msgstr ""
 
-#: ../src/palimpsest/gduatasmartdialog.c:1428
+#: ../src/disks/gduatasmartdialog.c:1299
 #, fuzzy
 #| msgid "Error reading SMART data"
 msgid "Error refreshing SMART data"
 msgstr "SMART ããããèãåãäãããããççãããã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1460
+#: ../src/disks/gduatasmartdialog.c:1331
 #, fuzzy
 #| msgid "Error reading SMART data"
 msgid "Error aborting SMART self-test"
 msgstr "SMART ããããèãåãäãããããççãããã"
 
-#: ../src/palimpsest/gduatasmartdialog.c:1479
+#: ../src/disks/gduatasmartdialog.c:1350
 #, fuzzy
 #| msgid "Error reading SMART data"
 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:1465
 msgid "ID"
 msgstr "ID"
 
-#. Translators: This string is used as the column title in the treeview for the attribute name and 
description
-#: ../src/palimpsest/gduatasmartdialog.c:1606
-msgid "Attribute"
-msgstr "åæ"
+#. Translators: This string is used as the column title in the treeview for the attribute name and 
description
+#: ../src/disks/gduatasmartdialog.c:1477
+msgid "Attribute"
+msgstr "åæ"
+
+#. Translators: This is used in the benchmark graph - %d is megabytes per second
+#: ../src/disks/gdubenchmarkdialog.c:327
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%d MB/s"
+msgstr ""
+
+#. Translators: This is used in the benchmark graph - %g is number of milliseconds
+#: ../src/disks/gdubenchmarkdialog.c:332
+#, c-format
+msgctxt "benchmark-graph"
+msgid "%3g ms"
+msgstr ""
+
+#. Translators: %s is the formatted size, e.g. "42 MB" and the trailing "/s" means per second
+#: ../src/disks/gdubenchmarkdialog.c:640
+#, c-format
+msgctxt "benchmark-transfer-rate"
+msgid "%s/s"
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:655 ../src/disks/gdubenchmarkdialog.c:954
+#, c-format
+msgid "%d sample"
+msgid_plural "%d samples"
+msgstr[0] ""
+
+#. Translators: The first %s is the date and time the benchmark took place in the preferred
+#. * format for the locale (e.g. "%c" for strftime()/g_date_time_format()), for example
+#. * "Tue 12 Jun 2012 03:57:08 PM EDT". The second %s is how long ago that is from right
+#. * now, for example "3 days" or "2 hours" or "12 minutes".
+#.
+#: ../src/disks/gdubenchmarkdialog.c:696
+#, fuzzy, c-format
+#| msgid "%s (%s bytes)"
+msgctxt "benchmark-updated"
+msgid "%s (%s ago)"
+msgstr "%s (%s ããã)"
+
+#: ../src/disks/gdubenchmarkdialog.c:708
+msgctxt "benchmark-updated"
+msgid "No benchmark data available"
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:713
+#, fuzzy
+#| msgid "Error mounting device"
+msgctxt "benchmark-updated"
+msgid "Opening Device..."
+msgstr "ãããããããããäãããããççãããã"
+
+#: ../src/disks/gdubenchmarkdialog.c:717
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring transfer rate (%2.1f%% complete)..."
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:724
+#, c-format
+msgctxt "benchmark-updated"
+msgid "Measuring access time (%2.1f%% complete)..."
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:840
+msgctxt "benchmarking"
+msgid "An error occurred"
+msgstr ""
+
+#. Translators: The first %s is the partition size (e.g. "10.0 GB") and the two
+#. * following %s are make/model (e.g. "ST 3160A") and description (e.g. "60 GB Hard Disk")
+#.
+#: ../src/disks/gdubenchmarkdialog.c:876
+#, fuzzy, c-format
+#| msgid "Partition %d on %s"
+msgctxt "benchmark-drive-name"
+msgid "%s partition on %s (%s)"
+msgstr "%2$s ãããããããã %1$d"
+
+#. Translators: The first %s is the make/model (e.g. "ST 3160A"), the second %s is
+#. * the description (e.g. "60 GB Hard Disk")
+#.
+#: ../src/disks/gdubenchmarkdialog.c:886
+#, fuzzy, c-format
+#| msgid "%s (%s bytes)"
+msgctxt "benchmark-drive-name"
+msgid "%s (%s)"
+msgstr "%s (%s ããã)"
+
+#. Translators: %d is number of milliseconds and msec means "milli-second"
+#: ../src/disks/gdubenchmarkdialog.c:952
+#, fuzzy, c-format
+#| msgid "%.1f seconds"
+msgctxt "benchmark-access-time"
+msgid "%.2f msec"
+msgstr "%.1f ç"
+
+#: ../src/disks/gdubenchmarkdialog.c:1264
+#, fuzzy, c-format
+#| msgid "Error mounting device"
+msgctxt "benchmarking"
+msgid "Error getting size of device: %m"
+msgstr "ãããããããããäãããããççãããã"
+
+#: ../src/disks/gdubenchmarkdialog.c:1274
+#, fuzzy, c-format
+#| msgid "Error deleting partition"
+msgctxt "benchmarking"
+msgid "Error getting page size: %m\n"
+msgstr "ããããããããåéäãããããççãããã"
+
+#: ../src/disks/gdubenchmarkdialog.c:1307
+#: ../src/disks/gdubenchmarkdialog.c:1326
+#: ../src/disks/gdubenchmarkdialog.c:1362
+#: ../src/disks/gdubenchmarkdialog.c:1381
+#, fuzzy, c-format
+#| msgid "Error reading stderr from: %s"
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld"
+msgstr "ææããããääããèãèãäãããã: %s"
+
+#: ../src/disks/gdubenchmarkdialog.c:1316
+#: ../src/disks/gdubenchmarkdialog.c:1371
+#, fuzzy, c-format
+#| msgid "Error reading stderr from: %s"
+msgctxt "benchmarking"
+msgid "Error pre-reading %lld bytes from offset %lld"
+msgstr "ææããããääããèãèãäãããã: %s"
+
+#: ../src/disks/gdubenchmarkdialog.c:1337
+#, fuzzy, c-format
+#| msgid "Error reading stderr from: %s"
+msgctxt "benchmarking"
+msgid "Error reading %d MB from offset %lld"
+msgstr "ææããããääããèãèãäãããã: %s"
+
+#: ../src/disks/gdubenchmarkdialog.c:1392
+#, c-format
+msgctxt "benchmarking"
+msgid "Error writing %lld bytes at offset %lld: %m"
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:1402
+#, c-format
+msgctxt "benchmarking"
+msgid "Expected to write %lld bytes, only wrote %lld: %m"
+msgstr ""
+
+#: ../src/disks/gdubenchmarkdialog.c:1412
+#, fuzzy, c-format
+#| msgid "Error reading stderr from: %s"
+msgctxt "benchmarking"
+msgid "Error syncing (at offset %lld): %m"
+msgstr "ææããããääããèãèãäãããã: %s"
+
+#: ../src/disks/gdubenchmarkdialog.c:1452
+#, fuzzy, c-format
+#| msgid "Error reading stderr from: %s"
+msgctxt "benchmarking"
+msgid "Error seeking to offset %lld: %m"
+msgstr "ææããããääããèãèãäãããã: %s"
+
+#: ../src/disks/gdubenchmarkdialog.c:1464
+#, fuzzy, c-format
+#| msgid "Error reading stderr from: %s"
+msgctxt "benchmarking"
+msgid "Error reading %lld bytes from offset %lld"
+msgstr "ææããããääããèãèãäãããã: %s"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:171
+#: ../src/disks/gduchangepassphrasedialog.c:157
 msgid "Error updating /etc/crypttab"
 msgstr ""
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:190
+#: ../src/disks/gduchangepassphrasedialog.c:176
 #, fuzzy
 #| msgid "Error changing label"
 msgid "Error changing passphrase"
 msgstr "ããããåæäãããããççãããã"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:277
-#: ../src/palimpsest/gducrypttabdialog.c:424
+#: ../src/disks/gduchangepassphrasedialog.c:263
+#: ../src/disks/gducrypttabdialog.c:408
 #, fuzzy
 #| msgid "Error creating partition"
 msgid "Error retrieving configuration data"
 msgstr "ããããããããäæäãããããççãããã"
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:303
+#: ../src/disks/gduchangepassphrasedialog.c:289
 msgid "/etc/crypttab configuration data is malformed"
 msgstr ""
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:336
-msgid ""
-"Changing the passphrase for this device, will also update the passphrase "
-"referenced by the <i>/etc/crypttab</i> file"
+#: ../src/disks/gduchangepassphrasedialog.c:322
+msgid "Changing the passphrase for this device, will also update the passphrase referenced by the 
<i>/etc/crypttab</i> file"
 msgstr ""
 
-#: ../src/palimpsest/gduchangepassphrasedialog.c:355
-#: ../src/palimpsest/gducreatefilesystemwidget.c:503
+#: ../src/disks/gduchangepassphrasedialog.c:341
+#: ../src/disks/gducreatefilesystemwidget.c:540
 #, fuzzy
 #| msgid "Are you sure you want to forget the passphrase?"
 msgid "The strength of the passphrase"
@@ -1777,194 +2017,231 @@ msgstr "æåããããããããåãããããã?"
 #. *              The first %s is a name for the disk (e.g. 'sdb').
 #. *              The second %s is today's date and time, e.g. "March 2, 1976 6:25AM".
 #.
-#: ../src/palimpsest/gducreatediskimagedialog.c:196
+#: ../src/disks/gducreatediskimagedialog.c:212
 #, c-format
 msgid "Disk Image of %s (%s).img"
 msgstr ""
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:233
-#: ../src/palimpsest/gdurestorediskimagedialog.c:274
+#: ../src/disks/gducreatediskimagedialog.c:251
 #, fuzzy
 #| msgid "Error formatting volume"
-msgid "Error writing to backup image"
+msgid "Error writing to image"
 msgstr "ããããããããããããäãããããççãããã"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:313
-#: ../src/palimpsest/gdurestorediskimagedialog.c:353
+#. Translators: string used for conveying progress of copy operation.
+#. * The first two %s are strings with the amount of bytes (ex. "3.4 MB" and "300 MB").
+#. * The third %s is the estimated amount of time remaining (ex. "1 minute", "5 minutes" or "Less than a 
minute").
+#. * The fourth %s is the average amount of bytes transfered per second (ex. "8.9 MB").
+#.
+#: ../src/disks/gducreatediskimagedialog.c:279
+#: ../src/disks/gdurestorediskimagedialog.c:319
+#, c-format
+msgid "%s of %s copied â %s remaining (%s/sec)"
+msgstr ""
+
+#. Translators: string used for convey progress of a copy operation where we don't know time remaining / 
speed.
+#. * The first two %s are strings with the amount of bytes (ex. "3.4 MB" and "300 MB").
+#.
+#: ../src/disks/gducreatediskimagedialog.c:292
+#: ../src/disks/gdurestorediskimagedialog.c:332
+#, c-format
+msgid "%s of %s copied"
+msgstr ""
+
+#: ../src/disks/gducreatediskimagedialog.c:341
+#: ../src/disks/gdurestorediskimagedialog.c:380
 #, fuzzy
 #| msgid "Error reading stderr from: %s"
 msgid "Error reading from offset %"
 msgstr "ææããããääããèãèãäãããã: %s"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:381
-#: ../src/palimpsest/gdurestorediskimagedialog.c:541
+#: ../src/disks/gducreatediskimagedialog.c:404
+#: ../src/disks/gdurestorediskimagedialog.c:600
 #, fuzzy
 #| msgid "Error mounting device"
-msgid "Error opening device"
+msgid "Error determining size of device"
 msgstr "ãããããããããäãããããççãããã"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:396
-#: ../src/palimpsest/gdurestorediskimagedialog.c:557
+#: ../src/disks/gducreatediskimagedialog.c:442
+#: ../src/disks/gdurestorediskimagedialog.c:585
 #, fuzzy
 #| msgid "Error mounting device"
-msgid "Error determining size of device"
+msgid "Error opening device"
 msgstr "ãããããããããäãããããççãããã"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:446
+#: ../src/disks/gducreatediskimagedialog.c:488
 #, c-format
 msgid "A file named \"%s\" already exists.  Do you want to replace it?"
 msgstr ""
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:449
+#: ../src/disks/gducreatediskimagedialog.c:491
 #, c-format
-msgid ""
-"The file already exists in \"%s\".  Replacing it will overwrite its contents."
+msgid "The file already exists in \"%s\".  Replacing it will overwrite its contents."
 msgstr ""
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:453
+#: ../src/disks/gducreatediskimagedialog.c:495
 #, fuzzy
 #| msgid "_Repair"
 msgid "_Replace"
 msgstr "äå(_R)"
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:495
+#: ../src/disks/gducreatediskimagedialog.c:538
 msgid "Error opening file for writing"
 msgstr ""
 
-#: ../src/palimpsest/gducreatediskimagedialog.c:564
-#, c-format
-msgid "Copying data from device <i>%s</i>..."
-msgstr ""
+#: ../src/disks/gducreatediskimagedialog.c:589
+#, fuzzy
+#| msgid "Copying data to device..."
+msgid "Copying data from device..."
+msgstr "ããããããããããããä..."
+
+#. Translators: This is the window title for the non-modal "Create Disk Image" dialog. The %s is the device.
+#: ../src/disks/gducreatediskimagedialog.c:637
+#, fuzzy, c-format
+#| msgid "Create Disk Image..."
+msgid "Create Disk Image (%s)"
+msgstr "ãããããããããäæ..."
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:388
-#: ../src/palimpsest/gduformatdiskdialog.c:130
+#: ../src/disks/gducreatefilesystemwidget.c:379
+#: ../src/disks/gduformatdiskdialog.c:254
 #, fuzzy
 #| msgid "Compatible with all systems (FAT)"
 msgid "Compatible with all systems and devices"
 msgstr "ãããããããããäæ (FAT)"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:389
+#: ../src/disks/gducreatefilesystemwidget.c:380
 msgid "FAT"
 msgstr "FAT"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:394
+#: ../src/disks/gducreatefilesystemwidget.c:385
 msgid "Compatible with most systems"
 msgstr "ãããããããããããäæ"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:395
+#: ../src/disks/gducreatefilesystemwidget.c:386
 msgid "NTFS"
 msgstr "NTFS"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:400
+#: ../src/disks/gducreatefilesystemwidget.c:391
 msgid "Compatible with Linux systems"
 msgstr "Linux ãããããäæ"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:401
+#: ../src/disks/gducreatefilesystemwidget.c:392
 msgid "Ext4"
 msgstr "Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:406
+#: ../src/disks/gducreatefilesystemwidget.c:397
 msgid "Encrypted, compatible with Linux systems"
 msgstr "æååãLinux ãããããäæ"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:407
+#: ../src/disks/gducreatefilesystemwidget.c:398
 msgid "LUKS + Ext4"
 msgstr "LUKS + Ext4"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:412
+#: ../src/disks/gducreatefilesystemwidget.c:403
 msgid "Custom"
 msgstr "ãããã"
 
-#: ../src/palimpsest/gducreatefilesystemwidget.c:413
+#: ../src/disks/gducreatefilesystemwidget.c:404
 #, fuzzy
 #| msgid "Filesystem type"
 msgid "Enter filesystem type"
 msgstr "ãããããããããããã"
 
 #. Translators: this is the default name for the filesystem
-#: ../src/palimpsest/gducreatefilesystemwidget.c:456
+#: ../src/disks/gducreatefilesystemwidget.c:450
 msgid "New Volume"
 msgstr "æããããããã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:215
+#: ../src/disks/gducreatefilesystemwidget.c:489
+#: ../src/disks/gduformatdiskdialog.c:151
+msgid "Don't overwrite existing data"
+msgstr ""
+
+#: ../src/disks/gducreatefilesystemwidget.c:490
+#: ../src/disks/gduformatdiskdialog.c:152
+msgid "Quick"
+msgstr ""
+
+#: ../src/disks/gducreatefilesystemwidget.c:497
+#: ../src/disks/gduformatdiskdialog.c:162
+msgid "Overwrite existing data with zeroes"
+msgstr ""
+
+#: ../src/disks/gducreatefilesystemwidget.c:498
+#: ../src/disks/gduformatdiskdialog.c:163
+msgid "Slow"
+msgstr ""
+
+#: ../src/disks/gducreatepartitiondialog.c:201
 msgid "Error formatting partition"
 msgstr "ããããããããåæåäãããããççãããã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:242
+#: ../src/disks/gducreatepartitiondialog.c:229
 msgid "Error creating partition"
 msgstr "ããããããããäæäãããããççãããã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:326
+#: ../src/disks/gducreatepartitiondialog.c:317
 msgid "Extended partition"
 msgstr "æåããããããã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:327
+#: ../src/disks/gducreatepartitiondialog.c:318
 #, fuzzy
 #| msgid "Contains logical partitions"
 msgid "For logical partitions"
 msgstr "èçããããããããåããããã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:340
+#: ../src/disks/gducreatepartitiondialog.c:331
 #, fuzzy
 #| msgid "Create an Extended Partition for logical partitions."
-msgid ""
-"Cannot create a new partition. There are already four primary partitions."
+msgid "Cannot create a new partition. There are already four primary partitions."
 msgstr "èçããããããããæåããããããããäæããã"
 
-#: ../src/palimpsest/gducreatepartitiondialog.c:344
+#: ../src/disks/gducreatepartitiondialog.c:335
 #, fuzzy
-#| msgid ""
-#| "This is the last primary partition that can be created. If you need more "
-#| "partitions, you can create an Extended Partition."
+#| msgid "This is the last primary partition that can be created. If you need more partitions, you can 
create an Extended Partition."
 msgid "This is the last primary partition that can be created."
-msgstr ""
-"ãããäæãããæåãåæããããããããããããäåããããããããããã"
-"äæããåèæããããããããéåãæåããããããããããæãéåããã"
+msgstr "ãããäæãããæåãåæããããããããããããäåãããããããããããäæããåèæããããããããéåãæåããããããããããæãéåããã"
 
-#: ../src/palimpsest/gducrypttabdialog.c:122
-#: ../src/palimpsest/gducrypttabdialog.c:142
+#: ../src/disks/gducrypttabdialog.c:108 ../src/disks/gducrypttabdialog.c:128
 #, fuzzy
 #| msgid "A volume will be created"
 msgid "Will be created"
 msgstr "äæãã"
 
-#: ../src/palimpsest/gducrypttabdialog.c:124
-#: ../src/palimpsest/gducrypttabdialog.c:149
+#: ../src/disks/gducrypttabdialog.c:110 ../src/disks/gducrypttabdialog.c:135
 msgid "None"
 msgstr "ãã"
 
-#: ../src/palimpsest/gducrypttabdialog.c:151
+#: ../src/disks/gducrypttabdialog.c:137
 msgid "Will be deleted"
 msgstr "åéãã"
 
-#: ../src/palimpsest/gducrypttabdialog.c:278
+#: ../src/disks/gducrypttabdialog.c:263
 msgid "Error removing /etc/crypttab entry"
 msgstr "/etc/crypttab ããããããåéäãããããççãããã"
 
-#: ../src/palimpsest/gducrypttabdialog.c:363
+#: ../src/disks/gducrypttabdialog.c:347
 msgid "Error adding /etc/crypttab entry"
 msgstr "/etc/crypttab ããããããèåäãããããççãããã"
 
-#: ../src/palimpsest/gducrypttabdialog.c:386
+#: ../src/disks/gducrypttabdialog.c:370
 msgid "Error updating /etc/crypttab entry"
 msgstr "/etc/crypttab ããããããææäãããããççãããã"
 
-#: ../src/palimpsest/gducrypttabdialog.c:509
-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>"
+#: ../src/disks/gducrypttabdialog.c:493
+msgid "Only the passphrase referenced by the <i>/etc/crypttab</i> file will be changed. To change the 
on-disk passphrase, use <i>Change Passphrase...</i>"
 msgstr ""
 
-#: ../src/palimpsest/gdudevicetreemodel.c:410
+#: ../src/disks/gdudevicetreemodel.c:533
 msgid "Disk Drives"
 msgstr "ãããããããã"
 
-#: ../src/palimpsest/gdudevicetreemodel.c:820
+#: ../src/disks/gdudevicetreemodel.c:942
 msgid "Other Devices"
 msgstr "ããäããããã"
 
 #. Translators: This is for a /dev/loop device - %s is the size of the device e.g. "230 MB".
-#: ../src/palimpsest/gdudevicetreemodel.c:925
+#: ../src/disks/gdudevicetreemodel.c:1047
 #, c-format
 msgid "%s Loop Device"
 msgstr "%s ããããããã"
@@ -1972,231 +2249,373 @@ msgstr "%s ããããããã"
 #. Translators: This is for a block device which we failed to categorize  - %s is
 #. * the size of the device e.g. "230 MB".
 #.
-#: ../src/palimpsest/gdudevicetreemodel.c:946
+#: ../src/disks/gdudevicetreemodel.c:1068
 #, c-format
 msgid "%s Block Device"
 msgstr "%s ãããããããã"
 
-#: ../src/palimpsest/gdufilesystemdialog.c:74
+#: ../src/disks/gdudisksettingsdialog.c:264
+msgctxt "standby-value"
+msgid "Never"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:283
+msgctxt "standby-value"
+msgid "Vendor-defined"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:287
+msgctxt "standby-value"
+msgid "Reserved"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:308
+msgctxt "apm-level"
+msgid "255 (Disabled)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:312
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down permitted)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:316
+#, c-format
+msgctxt "apm-level"
+msgid "%d (Spin-down not permitted)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:331
+msgctxt "aam-level"
+msgid "0 (Disabled)"
+msgstr ""
+
+#: ../src/disks/gdudisksettingsdialog.c:360
+#, fuzzy
+#| msgid "Error creating partition"
+msgid "Error setting configuration"
+msgstr "ããããããããäæäãããããççãããã"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:390
+msgid "Never"
+msgstr ""
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:392
+#, fuzzy
+#| msgid "%d minutes"
+msgid "5 minutes"
+msgstr "%d å"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:394
+#, fuzzy
+#| msgid "%d minutes"
+msgid "10 minutes"
+msgstr "%d å"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:396
+#, fuzzy
+#| msgid "%d minutes"
+msgid "15 minutes"
+msgstr "%d å"
+
+#. Translators: This is a mark on the Standby scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:398
+#, fuzzy
+#| msgid "%d hours"
+msgid "3 hours"
+msgstr "%d æé"
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:402
+#, fuzzy
+#| msgid "Save in _folder"
+msgid "Save Power"
+msgstr "ããããããäå(_F)"
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible. The left arrow 
("â") is to signify that the left part of the scale offers spindown. In RTL locales, please use a right arrow 
("â") instead.
+#: ../src/disks/gdudisksettingsdialog.c:404
+msgid "â Spindown"
+msgstr ""
+
+#. Translators: This is a mark on the APM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:406
+msgid "Perform Better"
+msgstr ""
+
+#. Translators: This is a mark on the AAM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:410
+msgid "Quiet (Slow)"
+msgstr ""
+
+#. Translators: This is a mark on the AAM scale. The string should be as short as possible
+#: ../src/disks/gdudisksettingsdialog.c:412
+msgid "Loud (Fast)"
+msgstr ""
+
+#: ../src/disks/gdufilesystemdialog.c:60
 #, fuzzy
 #| msgid "Error changing label"
 msgid "Error setting label"
 msgstr "ããããåæäãããããççãããã"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:131
+#. Translators: Used to convey that something takes at least
+#. * some specificed duration but may take longer. The %s is a
+#. * time duration e.g. "8 hours and 28 minutes"
+#.
+#: ../src/disks/gduformatdiskdialog.c:105
+#, c-format
+msgid "At least %s"
+msgstr ""
+
+#. Translators: Used to convey that something takes
+#. * approximately some specificed duration. The %s is a time
+#. * duration e.g. "2 hours and 2 minutes"
+#.
+#: ../src/disks/gduformatdiskdialog.c:116
+#, c-format
+msgid "Approximately %s"
+msgstr ""
+
+#: ../src/disks/gduformatdiskdialog.c:195
+msgid "ATA Secure Erase"
+msgstr ""
+
+#: ../src/disks/gduformatdiskdialog.c:210
+msgid "ATA Enhanced Secure Erase"
+msgstr ""
+
+#: ../src/disks/gduformatdiskdialog.c:255
 msgid "MBR / DOS"
 msgstr "MBR / DOS"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:138
+#: ../src/disks/gduformatdiskdialog.c:265
 #, fuzzy
 #| msgid "Compatible with all systems (FAT)"
 msgid "Compatible with modern systems and hard disks > 2TB"
 msgstr "ãããããããããäæ (FAT)"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:139
+#: ../src/disks/gduformatdiskdialog.c:266
 msgid "GPT"
 msgstr "GPT"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:151
+#: ../src/disks/gduformatdiskdialog.c:283
 msgid "No partitioning"
 msgstr "ãããããããçã"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:152
+#: ../src/disks/gduformatdiskdialog.c:284
 msgid "Empty"
 msgstr "ç"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:186
+#: ../src/disks/gduformatdiskdialog.c:328
 msgid "Error formatting disk"
 msgstr "ãããããåæåäãããããççãããã"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:231
+#: ../src/disks/gduformatdiskdialog.c:385
 msgid "Are you sure you want to format the disk?"
 msgstr "æåããããããåæåãããã?"
 
-#: ../src/palimpsest/gduformatdiskdialog.c:232
-#: ../src/palimpsest/gduformatvolumedialog.c:158
-msgid "All data on the volume will be lost"
-msgstr "ããããããåããããåãããã"
+#. Translators: warning used for quick format
+#: ../src/disks/gduformatdiskdialog.c:389
+msgid "All data on the disk will be lost but may still be recoverable by data recovery services"
+msgstr ""
+
+#: ../src/disks/gduformatdiskdialog.c:391
+#: ../src/disks/gduformatvolumedialog.c:153
+msgid "<b>Tip</b>: If you are planning to recycle, sell or give away your old computer or disk, you should 
use a more thorough erase type to keep your private information from falling into the wrong hands"
+msgstr ""
+
+#. Translators: warning used when overwriting data
+#: ../src/disks/gduformatdiskdialog.c:396
+msgid "All data on the disk will be overwritten and will likely not be recoverable by data recovery services"
+msgstr ""
+
+#: ../src/disks/gduformatdiskdialog.c:404
+msgid "<b>WARNING</b>: The Secure Erase command may take a very long time to complete, can't be canceled and 
may not work properly with some hardware. In the worst case, your drive may be rendered unusable or your 
system may crash or lock up. Before proceeding, please read the article about <a 
href='https://ata.wiki.kernel.org/index.php/ATA_Secure_Erase'>ATA Secure Erase</a> and make sure you 
understand the risks"
+msgstr ""
 
-#: ../src/palimpsest/gduformatdiskdialog.c:233
-#: ../src/palimpsest/gduformatvolumedialog.c:159
+#: ../src/disks/gduformatdiskdialog.c:411
+#: ../src/disks/gduformatvolumedialog.c:164
 msgid "_Format"
 msgstr "åæå(_F)"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:100
+#: ../src/disks/gduformatvolumedialog.c:86
 msgid "Error formatting volume"
 msgstr "ããããããåæåäãããããççãããã"
 
-#: ../src/palimpsest/gduformatvolumedialog.c:157
+#: ../src/disks/gduformatvolumedialog.c:147
 msgid "Are you sure you want to format the volume?"
 msgstr "æåãããããããåæåãããã?"
 
-#: ../src/palimpsest/gdufstabdialog.c:166
+#. Translators: warning used for quick format of the volume
+#: ../src/disks/gduformatvolumedialog.c:151
+msgid "All data on the volume will be lost but may still be recoverable by data recovery services"
+msgstr ""
+
+#. Translators: warning used when overwriting data of the volume
+#: ../src/disks/gduformatvolumedialog.c:158
+msgid "All data on the volume will be overwritten and will likely not be recoverable by data recovery 
services"
+msgstr ""
+
+#: ../src/disks/gdufstabdialog.c:152
 #, c-format
 msgid "Matches partition %d of the device with the given vital product data"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:169
+#: ../src/disks/gdufstabdialog.c:155
 msgid "Matches the whole disk of the device with the given vital product data"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:174
+#: ../src/disks/gdufstabdialog.c:160
 #, c-format
-msgid ""
-"Matches partition %d of any device connected at the given port or address"
+msgid "Matches partition %d of any device connected at the given port or address"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:177
-msgid ""
-"Matches the whole disk of any device connected at the given port or address"
+#: ../src/disks/gdufstabdialog.c:163
+msgid "Matches the whole disk of any device connected at the given port or address"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:181
+#: ../src/disks/gdufstabdialog.c:167
 msgid "Matches any device with the given label"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:185
+#: ../src/disks/gdufstabdialog.c:171
 msgid "Matches the device with the given UUID"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:189
+#: ../src/disks/gdufstabdialog.c:175
 #, fuzzy
 #| msgid "Mount the filesystem on device"
 msgid "Matches the given device"
 msgstr "ããããäããããããããããããããããã"
 
-#: ../src/palimpsest/gdufstabdialog.c:473
+#: ../src/disks/gdufstabdialog.c:459
 msgid "The system may not work correctly if this entry is modified or removed."
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:532
+#: ../src/disks/gdufstabdialog.c:518
 msgid "Error removing old /etc/fstab entry"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:588
+#: ../src/disks/gdufstabdialog.c:574
 msgid "Error adding new /etc/fstab entry"
 msgstr ""
 
-#: ../src/palimpsest/gdufstabdialog.c:612
+#: ../src/disks/gdufstabdialog.c:598
 msgid "Error updating /etc/fstab entry"
 msgstr "/etc/fstab ããããããææäãããããççãããã"
 
-#: ../src/palimpsest/gdupartitiondialog.c:369
+#: ../src/disks/gdupartitiondialog.c:355
 msgid "Error setting partition type"
 msgstr "ãããããããããããèåäãããããççãããã"
 
-#: ../src/palimpsest/gdupartitiondialog.c:383
+#: ../src/disks/gdupartitiondialog.c:369
 #, fuzzy
 #| msgid "Error deleting partition"
 msgid "Error setting partition name"
 msgstr "ããããããããåéäãããããççãããã"
 
-#: ../src/palimpsest/gdupartitiondialog.c:397
+#: ../src/disks/gdupartitiondialog.c:383
 #, fuzzy
 #| msgid "Error deleting partition"
 msgid "Error setting partition flags"
 msgstr "ããããããããåéäãããããççãããã"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:169
+#: ../src/disks/gdupasswordstrengthwidget.c:126
+msgctxt "Password strength"
 msgid "Weak"
 msgstr ""
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:170
+#: ../src/disks/gdupasswordstrengthwidget.c:127
+msgctxt "Password strength"
 msgid "Fair"
 msgstr ""
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:171
+#: ../src/disks/gdupasswordstrengthwidget.c:128
+#, fuzzy
+#| msgid "Good"
+msgctxt "Password strength"
 msgid "Good"
 msgstr "Good"
 
-#: ../src/palimpsest/gdupasswordstrengthwidget.c:172
+#: ../src/disks/gdupasswordstrengthwidget.c:129
+msgctxt "Password strength"
 msgid "Strong"
 msgstr ""
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:167
+#: ../src/disks/gdurestorediskimagedialog.c:126
+#, fuzzy
+#| msgid "Error mounting device"
+msgid "Error rescanning device"
+msgstr "ãããããããããäãããããççãããã"
+
+#: ../src/disks/gdurestorediskimagedialog.c:185
 msgid "Cannot restore image of size 0"
 msgstr ""
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:176
+#: ../src/disks/gdurestorediskimagedialog.c:194
 #, c-format
 msgid "The selected image is %s smaller than the device"
 msgstr ""
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:185
+#: ../src/disks/gdurestorediskimagedialog.c:203
 #, c-format
 msgid "The selected image is %s bigger than the device"
 msgstr ""
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:416
+#: ../src/disks/gdurestorediskimagedialog.c:292
+#, fuzzy
+#| msgid "Error mounting device"
+msgid "Error writing to device"
+msgstr "ãããããããããäãããããççãããã"
+
+#: ../src/disks/gdurestorediskimagedialog.c:443
 msgid "Error opening file for reading"
 msgstr ""
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:430
+#: ../src/disks/gdurestorediskimagedialog.c:457
 #, fuzzy
 #| msgid "Error deleting Logical Volume"
 msgid "Error determing size of file"
 msgstr "èçããããããåéäãããããççãããã"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:495
+#: ../src/disks/gdurestorediskimagedialog.c:487
 #, fuzzy
 #| msgid "Are you sure you want to format the drive?"
 msgid "Are you sure you want to write the disk image to the device?"
 msgstr "æåãããããããããããããããã?"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:496
+#: ../src/disks/gdurestorediskimagedialog.c:488
 msgid "All existing data will be lost"
 msgstr ""
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:497
+#: ../src/disks/gdurestorediskimagedialog.c:489
 msgid "_Restore"
 msgstr "ãããã(_R)"
 
-#: ../src/palimpsest/gdurestorediskimagedialog.c:500
-#, c-format
-msgid "Copying data to device <i>%s</i>..."
-msgstr ""
+#. Translators: This is the window title for the non-modal "Restore Disk Image" dialog. The %s is the device.
+#: ../src/disks/gdurestorediskimagedialog.c:551
+#, fuzzy, c-format
+#| msgid "Restore Disk Image..."
+msgid "Restore Disk Image (%s)"
+msgstr "ããããããããããããã..."
 
-#: ../src/palimpsest/gduunlockdialog.c:50
+#: ../src/disks/gduunlockdialog.c:86
 msgid "Error unlocking encrypted device"
 msgstr "æååããããããããããäãããããççãããã"
 
-#: ../src/palimpsest/gduutils.c:81
-msgid "All Files"
-msgstr "ãããããããã"
-
-#: ../src/palimpsest/gduutils.c:85
-msgid "Disk Images (*.img, *.iso)"
-msgstr "ãããããããã (*.img, *.iso)"
-
-#: ../src/palimpsest/gduutils.c:105
-#, fuzzy, c-format
-#| msgid "%d second"
-msgid "%d second"
-msgid_plural "%d seconds"
-msgstr[0] "%d ç"
-
-#: ../src/palimpsest/gduutils.c:112
-msgid "Less than a minute"
-msgstr "1 åäå"
-
-#: ../src/palimpsest/gduutils.c:118
-#, fuzzy, c-format
-#| msgid "%d minute"
-msgid "%d minute"
-msgid_plural "%d minutes"
-msgstr[0] "%d å"
-
-#: ../src/palimpsest/gduutils.c:126
-#, fuzzy, c-format
-#| msgid "%d hour"
-msgid "%d hour"
-msgid_plural "%d hours"
-msgstr[0] "%d æé"
+#: ../src/disks/gduunlockdialog.c:143
+msgid "The encryption passphrase was retrieved from the keyring"
+msgstr ""
 
 #. Translators: This is shown in the volume grid for a partition with a name/label.
 #. *              The %d is the partition number. The %s is the name
 #.
-#: ../src/palimpsest/gduvolumegrid.c:1536
+#: ../src/disks/gduvolumegrid.c:1525
 #, fuzzy, c-format
 #| msgid "Partition %d on %s"
 msgctxt "volume-grid"
@@ -2206,107 +2625,126 @@ msgstr "%2$s ãããããããã %1$d"
 #. Translators: This is shown in the volume grid for a partition with no name/label.
 #. *              The %d is the partition number
 #.
-#: ../src/palimpsest/gduvolumegrid.c:1543
+#: ../src/disks/gduvolumegrid.c:1532
 #, fuzzy, c-format
 #| msgid "Partition %d"
 msgctxt "volume-grid"
 msgid "Partition %d"
 msgstr "ããããããã %d"
 
-#: ../src/palimpsest/gduvolumegrid.c:1563
+#: ../src/disks/gduvolumegrid.c:1552
 #, fuzzy
 #| msgid "%s Media"
 msgid "No Media"
 msgstr "%s ãããã"
 
-#: ../src/palimpsest/gduvolumegrid.c:1580
+#: ../src/disks/gduvolumegrid.c:1569
 #, fuzzy
 #| msgid "No free space."
 msgctxt "volume-grid"
 msgid "Free Space"
 msgstr "æäçéåããããããã"
 
-#: ../src/palimpsest/gduvolumegrid.c:1622
+#: ../src/disks/gduvolumegrid.c:1611
 #, fuzzy
 #| msgid "Extended Partition"
 msgctxt "volume-grid"
 msgid "Extended Partition"
 msgstr "æåããããããã"
 
-#: ../src/palimpsest/gduvolumegrid.c:1646
+#: ../src/disks/gduvolumegrid.c:1635
 #, fuzzy
 #| msgid "Filesystem"
 msgctxt "volume-grid"
 msgid "Filesystem"
 msgstr "ãããããããã"
 
-#: ../src/palimpsest/gduvolumegrid.c:1665
+#: ../src/disks/gduvolumegrid.c:1653
 #, fuzzy
 #| msgid "swap"
 msgctxt "volume-grid"
 msgid "Swap"
 msgstr "ãããã"
 
-#: ../src/palimpsest/gduwindow.c:531
+#: ../src/disks/gduwindow.c:612
 #, fuzzy
 #| msgid "Error mounting device"
 msgid "Error deleting loop device"
 msgstr "ãããããããããäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:602 ../src/palimpsest/gduwindow.c:674
+#: ../src/disks/gduwindow.c:683 ../src/disks/gduwindow.c:754
 #, fuzzy
 #| msgid "Error detaching drive"
 msgid "Error attaching disk image"
 msgstr "ãããããåãåãäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:642
+#: ../src/disks/gduwindow.c:723
 #, fuzzy
 msgid "Select Disk Image to Attach"
 msgstr "æçãããããããããããéãããããã"
 
-#: ../src/palimpsest/gduwindow.c:646
+#: ../src/disks/gduwindow.c:727
 #, fuzzy
 msgid "_Attach"
 msgstr "æç(_A)"
 
 #. Add a RO check button that defaults to RO
-#: ../src/palimpsest/gduwindow.c:652
+#: ../src/disks/gduwindow.c:732
 msgid "Set up _read-only loop device"
 msgstr ""
 
-#: ../src/palimpsest/gduwindow.c:653
-msgid ""
-"If checked, the loop device will be read-only. This is useful if you don't "
-"want the underlying file to be modified"
+#: ../src/disks/gduwindow.c:733
+msgid "If checked, the loop device will be read-only. This is useful if you don't want the underlying file 
to be modified"
 msgstr ""
 
 #. Translators: Shown for a read-only device. The %s is the device file, e.g. /dev/sdb1
-#: ../src/palimpsest/gduwindow.c:1515
+#: ../src/disks/gduwindow.c:1699
 #, c-format
 msgid "%s <span size=\"smaller\">(Read-Only)</span>"
 msgstr ""
 
-#: ../src/palimpsest/gduwindow.c:1822
+#. Translators: Shown instead of e.g. "10 seconds remaining" when we've passed
+#. * the expected end time...
+#.
+#: ../src/disks/gduwindow.c:1731
+msgctxt "job-remaining-exceeded"
+msgid "Almost done..."
+msgstr ""
+
+#: ../src/disks/gduwindow.c:1736
+#, c-format
+msgctxt "job-remaining"
+msgid "%s remaining"
+msgstr ""
+
+#. Translators: Shown in "Location" when drive is connected to another seat than where
+#. * our application is running.
+#.
+#: ../src/disks/gduwindow.c:1892
+msgid "Connected to another seat"
+msgstr ""
+
+#: ../src/disks/gduwindow.c:2193
 #, fuzzy
 #| msgid "Unknown"
 msgctxt "partition type"
 msgid "Unknown"
 msgstr "äæ"
 
-#: ../src/palimpsest/gduwindow.c:1849
+#: ../src/disks/gduwindow.c:2225
 msgid "Extended Partition"
 msgstr "æåããããããã"
 
 #. Translators: Use for mount point '/' simply because '/' is too small to hit as a hyperlink
 #.
-#: ../src/palimpsest/gduwindow.c:1890
+#: ../src/disks/gduwindow.c:2266
 #, fuzzy
 #| msgid "Filesystem type"
 msgid "Filesystem Root"
 msgstr "ãããããããããããã"
 
 #. Translators: Shown next to "In Use". The first %s is the mount point, e.g. /media/foobar
-#: ../src/palimpsest/gduwindow.c:1898
+#: ../src/disks/gduwindow.c:2274
 #, fuzzy, c-format
 #| msgid "Mounted at %s"
 msgid "Yes, mounted at %s"
@@ -2315,8 +2753,8 @@ msgstr "%s ãääããããã"
 #. Translators: Shown when the device is not mounted next to the "In Use" label
 #. Translators: Shown if the swap device is not in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is not unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1904 ../src/palimpsest/gduwindow.c:1940
-#: ../src/palimpsest/gduwindow.c:1966
+#: ../src/disks/gduwindow.c:2280 ../src/disks/gduwindow.c:2316
+#: ../src/disks/gduwindow.c:2342
 #, fuzzy
 #| msgid "None"
 msgid "No"
@@ -2324,79 +2762,275 @@ msgstr "ãã"
 
 #. Translators: Shown if the swap device is in use next to the "In Use" label
 #. Translators: Shown if the encrypted device is unlocked next to the "In Use" label
-#: ../src/palimpsest/gduwindow.c:1934 ../src/palimpsest/gduwindow.c:1960
+#: ../src/disks/gduwindow.c:2310 ../src/disks/gduwindow.c:2336
 msgid "Yes"
 msgstr ""
 
 #. Translators: used to convey free space for partitions - the %s is the
 #. * partition table format e.g. "Master Boot Record" or "GUID Partition Table"
 #.
-#: ../src/palimpsest/gduwindow.c:2039
+#: ../src/disks/gduwindow.c:2470
 #, fuzzy, c-format
 #| msgid "Unallocated Space"
 msgid "Unallocated Space (%s)"
 msgstr "æåãåãéå"
 
 #. Translators: used to convey free space for partitions (partition table format not known)
-#: ../src/palimpsest/gduwindow.c:2044
+#: ../src/disks/gduwindow.c:2475
 msgid "Unallocated Space"
 msgstr "æåãåãéå"
 
-#: ../src/palimpsest/gduwindow.c:2400
+#: ../src/disks/gduwindow.c:2764
+msgid "An error occurred when trying to put the drive into standby mode"
+msgstr ""
+
+#: ../src/disks/gduwindow.c:2810
+msgid "An error occurred when trying to wake up the drive from standby mode"
+msgstr ""
+
+#: ../src/disks/gduwindow.c:2885
 #, fuzzy
 #| msgid "Error creating filesystem"
 msgid "Error mounting filesystem"
 msgstr "ãããããããããäæäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:2440
+#: ../src/disks/gduwindow.c:2925
 #, fuzzy
 #| msgid "Error creating filesystem"
 msgid "Error unmounting filesystem"
 msgstr "ãããããããããäæäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:2519
+#: ../src/disks/gduwindow.c:3006
 msgid "Error deleting partition"
 msgstr "ããããããããåéäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:2535
+#: ../src/disks/gduwindow.c:3022
 msgid "Are you sure you want to delete the partition?"
 msgstr "æåãããããããããåéãããã?"
 
-#: ../src/palimpsest/gduwindow.c:2536
+#: ../src/disks/gduwindow.c:3023
 #, fuzzy
 #| msgid "A partition will be created"
 msgid "All data on the partition will be lost"
 msgstr "ããããããããäæããã"
 
-#: ../src/palimpsest/gduwindow.c:2537
+#: ../src/disks/gduwindow.c:3024
 msgid "_Delete"
 msgstr "åé(_D)"
 
-#: ../src/palimpsest/gduwindow.c:2568
+#: ../src/disks/gduwindow.c:3055
 msgid "Error ejecting media"
 msgstr "ãããããåãåãäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:2620
+#: ../src/disks/gduwindow.c:3107
 msgid "Error locking encrypted device"
 msgstr "æååããããããããäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:2661
+#: ../src/disks/gduwindow.c:3148
 #, fuzzy
 #| msgid "Error starting RAID Array"
 msgid "Error starting swap"
 msgstr "swap ãéåäãããããççãããã"
 
-#: ../src/palimpsest/gduwindow.c:2698
+#: ../src/disks/gduwindow.c:3185
 #, fuzzy
 #| msgid "Error stopping RAID Array"
 msgid "Error stopping swap"
 msgstr "swap ãåæäãããããççãããã"
 
+#: ../src/disks/gduwindow.c:3227
+#, fuzzy
+#| msgid "Error deleting partition"
+msgid "Error setting autoclear flag"
+msgstr "ããããããããåéäãããããççãããã"
+
+#: ../src/disks/gduwindow.c:3280 ../src/disks/gduwindow.c:3335
+#, fuzzy
+#| msgid "Error changing label"
+msgid "Error canceling job"
+msgstr "ããããåæäãããããççãããã"
+
+#: ../src/libgdu/gduutils.c:86
+msgid "All Files"
+msgstr "ãããããããã"
+
+#: ../src/libgdu/gduutils.c:90
+msgid "Disk Images (*.img, *.iso)"
+msgstr "ãããããããã (*.img, *.iso)"
+
+#. Translators: Used for number of years
+#: ../src/libgdu/gduutils.c:403
+#, fuzzy, c-format
+#| msgid "%.1f years"
+msgid "%d year"
+msgid_plural "%d years"
+msgstr[0] "%.1f å"
+
+#. Translators: Used for number of months
+#: ../src/libgdu/gduutils.c:410
+#, fuzzy, c-format
+#| msgid "%d minute"
+msgid "%d month"
+msgid_plural "%d months"
+msgstr[0] "%d å"
+
+#. Translators: Used for number of days
+#: ../src/libgdu/gduutils.c:417
+#, fuzzy, c-format
+#| msgid "%.1f days"
+msgid "%d day"
+msgid_plural "%d days"
+msgstr[0] "%.1f æ"
+
+#. Translators: Used for number of hours
+#: ../src/libgdu/gduutils.c:424
+#, fuzzy, c-format
+#| msgid "%d hour"
+msgid "%d hour"
+msgid_plural "%d hours"
+msgstr[0] "%d æé"
+
+#. Translators: Used for number of minutes
+#: ../src/libgdu/gduutils.c:431
+#, fuzzy, c-format
+#| msgid "%d minute"
+msgid "%d minute"
+msgid_plural "%d minutes"
+msgstr[0] "%d å"
+
+#. Translators: Used for number of seconds
+#: ../src/libgdu/gduutils.c:438
+#, fuzzy, c-format
+#| msgid "%d second"
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d ç"
+
+#. Translators: Used for number of milli-seconds
+#: ../src/libgdu/gduutils.c:445
+#, fuzzy, c-format
+#| msgid "%d second"
+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/libgdu/gduutils.c:509
+#, c-format
+msgctxt "duration-year-to-inf"
+msgid "%s, %s and %s"
+msgstr ""
+
+#. Translators: Used for durations less than one year but greater than one month. First %s is number of 
months, second %s is days
+#: ../src/libgdu/gduutils.c:514
+#, c-format
+msgctxt "duration-months-to-year"
+msgid "%s and %s"
+msgstr ""
+
+#. Translators: Used for durations less than one month but greater than one day. First %s is number of days, 
second %s is hours
+#: ../src/libgdu/gduutils.c:519
+#, c-format
+msgctxt "duration-day-to-month"
+msgid "%s and %s"
+msgstr ""
+
+#. Translators: Used for durations less than one day but greater than one hour. First %s is number of hours, 
second %s is minutes
+#: ../src/libgdu/gduutils.c:524
+#, c-format
+msgctxt "duration-hour-to-day"
+msgid "%s and %s"
+msgstr ""
+
+#. Translators: Used for durations less than one hour but greater than one minute. First %s is number of 
minutes, second %s is seconds
+#: ../src/libgdu/gduutils.c:535
+#, c-format
+msgctxt "duration-minute-to-hour"
+msgid "%s and %s"
+msgstr ""
+
+#: ../src/libgdu/gduutils.c:544
+#, fuzzy
+#| msgid "Less than a minute"
+msgctxt "duration"
+msgid "Less than a minute"
+msgstr "1 åäå"
+
+#. Translators: Used for durations less than one minute byte greater than one second. First %s is number of 
seconds
+#: ../src/libgdu/gduutils.c:549
+#, c-format
+msgctxt "duration-second-to-minute"
+msgid "%s"
+msgstr ""
+
+#. Translators: Used for durations less than one second. First %s is number of milli-seconds
+#: ../src/libgdu/gduutils.c:555
+#, c-format
+msgctxt "duration-zero-to-second"
+msgid "%s"
+msgstr ""
+
+#~ msgid "<big>Change Passphrase</big>"
+#~ msgstr "<big>ãããããããåæ</big>"
+
+#~ msgid "<big>Create Disk Image</big>"
+#~ msgstr "<big>ãããããããããäæ</big>"
+
+#~ msgid "<big>Contents</big>"
+#~ msgstr "<big>åå</big>"
+
+#~ msgid "<big>Edit Partition</big>"
+#~ msgstr "<big>ããããããããçé</big>"
+
+#~ msgid "<big>Restore Disk Image</big>"
+#~ msgstr "<big>ããããããããããããã</big>"
+
+#, fuzzy
+#~| msgid "Updated:"
+#~ msgid "Updates"
+#~ msgstr "ææ:"
+
+#~ msgid "Normalized"
+#~ msgstr "æèåå"
+
+#, fuzzy
+#~| msgid "%.1f hours"
+#~ msgid "%.1f hour"
+#~ msgid_plural "%.1f hours"
+#~ msgstr[0] "%.1f æé"
+
+#, fuzzy
+#~| msgid "%.1f minutes"
+#~ msgid "%.1f minute"
+#~ msgid_plural "%.1f minutes"
+#~ msgstr[0] "%.1f å"
+
+#, fuzzy
+#~| msgid "%.1f seconds"
+#~ msgid "%.1f second"
+#~ msgid_plural "%.1f seconds"
+#~ msgstr[0] "%.1f ç"
+
+#, fuzzy
+#~| msgid "Failure is a sign of imminent disk failure (Pre-Fail)"
+#~ msgid "Failure is a sign the disk will fail within 24 hours (Pre-Fail)"
+#~ msgstr "æéæçããèãåæããããããæéãããããããããäæãã(Pre-Fail)"
+
+#~ 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 "ããããããåããããåãããã"
+
 #, fuzzy
 #~ msgid "Checked if an entry in the /etc/crypttab file exists for the device"
-#~ msgstr ""
-#~ "ãããããããåããããããã /etc/crypttab ãããããããååããããã"
-#~ "ãåããã"
+#~ msgstr "ãããããããåããããããã /etc/crypttab ãããããããååããããããåããã"
 
 #~ msgid "Con_figure passphrase and options"
 #~ msgstr "ãããããããããããããèåãã(_F)"
@@ -2405,8 +3039,7 @@ msgstr "swap ãåæäãããããççãããã"
 #~ msgstr "èåæããããããåããã"
 
 #~ msgid "If checked, the system won't wait for the device at startup [nofail]"
-#~ msgstr ""
-#~ "ãããããåããããããèåæãããããããããããåãããã [nofail]"
+#~ msgstr "ãããããåããããããèåæãããããããããããåãããã [nofail]"
 
 #~ msgid "What's this?"
 #~ msgstr "ãããä?"
@@ -2444,9 +3077,3 @@ msgstr "swap ãåæäãããããççãããã"
 
 #~ msgid "%d seconds"
 #~ msgstr "%d ç"
-
-#~ msgid "%d minutes"
-#~ msgstr "%d å"
-
-#~ msgid "%d hours"
-#~ msgstr "%d æé"


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