[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid/backends/hal
From:       Jacopo De Simoi <wilderkde () gmail ! com>
Date:       2009-12-12 16:26:52
Message-ID: 1260635212.302494.15110.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1061666 by jacopods:

Provide a correct description for encrypted devices
The string freeze exemption has been granted by the i18n team (Thanks!)
 
CCMAIL: kde-i18n-docs@kde.org


 M  +8 -1      haldevice.cpp  


--- trunk/KDE/kdelibs/solid/solid/backends/hal/haldevice.cpp #1061665:1061666
@@ -796,10 +796,17 @@
 
     bool drive_is_removable = storageDrive.isRemovable();
     bool drive_is_hotpluggable = storageDrive.isHotpluggable();
+    bool drive_is_encrypted_container = property("volume.fsusage").toString()=="crypto";
 
     QString size_str = formatByteSize(property("volume.size").toULongLong());
-    if (drive_type == Solid::StorageDrive::HardDisk && !drive_is_removable) {
+    if (drive_is_encrypted_container) {
         if (!size_str.isEmpty()) {
+            description = QObject::tr("%1 Encrypted Container", "%1 is the size").arg(size_str);
+        } else {
+            description = QObject::tr("Encrypted Container");
+        }
+    } else if (drive_type == Solid::StorageDrive::HardDisk && !drive_is_removable) {
+        if (!size_str.isEmpty()) {
             if (drive_is_hotpluggable) {
                 description = QObject::tr("%1 External Hard Drive", "%1 is the size").arg(size_str);
             } else {
[prev in list] [next in list] [prev in thread] [next in thread]