[gnome-disk-utility/udisks2-port] Tweak the strings shown for 'Configured'

[David Zeuthen <davidz src gnome org>]

commit a8f407f7152bb5e19026aa7ca8e2a7f86b6bd448
Author: David Zeuthen <davidz redhat com>
Date:   Fri Aug 12 15:33:35 2011 -0400

    Tweak the strings shown for 'Configured'
    
    Signed-off-by: David Zeuthen <davidz redhat com>

 src/palimpsest/gduwindow.c |   48 +++++++++++++++++++++++++++++++++-----------
 1 files changed, 36 insertions(+), 12 deletions(-)
---
diff --git a/src/palimpsest/gduwindow.c b/src/palimpsest/gduwindow.c
index 7a09790..49c4625 100644
--- a/src/palimpsest/gduwindow.c
+++ b/src/palimpsest/gduwindow.c
@@ -1554,19 +1554,43 @@ calculate_configuration_for_display (UDisksBlockDevice *block,
                 options = "";
               if (options_has (options, "noauto"))
                 {
-                  /* Translators: Shown when the device is configured in /etc/fstab
-                   * but not automatically mounted at boot time.
-                   * This string is shown next to the label "Configured".
-                   */
-                  g_string_append (str, _("Yes, manually"));
+                  if (g_strcmp0 (udisks_block_device_get_id_usage (block), "other") == 0 &&
+                      g_strcmp0 (udisks_block_device_get_id_type (block), "swap") == 0)
+                    {
+                      /* Translators: Shown when the device is configured in /etc/fstab
+                       * is a swap device but not automatically mounted at boot time.
+                       * This string is shown next to the label "Configured".
+                       */
+                      g_string_append (str, _("Yes (not activated at system startup)"));
+                    }
+                  else
+                    {
+                      /* Translators: Shown when the device is configured in /etc/fstab
+                       * but not automatically mounted at boot time.
+                       * This string is shown next to the label "Configured".
+                       */
+                      g_string_append (str, _("Yes (not mounted at system startup)"));
+                    }
                 }
               else
                 {
-                  /* Translators: Shown when the device is configured in /etc/fstab
-                   * and automatically mounted at boot time.
-                   * This string is shown next to the label "Configured".
-                   */
-                  g_string_append (str, _("Yes, at system startup"));
+                  if (g_strcmp0 (udisks_block_device_get_id_usage (block), "other") == 0 &&
+                      g_strcmp0 (udisks_block_device_get_id_type (block), "swap") == 0)
+                    {
+                      /* Translators: Shown when the device is configured in /etc/fstab
+                       * is a swap device and automatically activated at boot time.
+                       * This string is shown next to the label "Configured".
+                       */
+                      g_string_append (str, _("Yes (activated at system startup)"));
+                    }
+                  else
+                    {
+                      /* Translators: Shown when the device is configured in /etc/fstab
+                       * and automatically mounted at boot time.
+                       * This string is shown next to the label "Configured".
+                       */
+                      g_string_append (str, _("Yes (mounted at system startup)"));
+                    }
                 }
             }
         }
@@ -1585,7 +1609,7 @@ calculate_configuration_for_display (UDisksBlockDevice *block,
                    * but not automatically unlocked at boot time.
                    * This string is shown next to the label "Configured".
                    */
-                  g_string_append (str, _("Yes, manually"));
+                  g_string_append (str, _("Yes (not unlocked at system startup)"));
                 }
               else
                 {
@@ -1593,7 +1617,7 @@ calculate_configuration_for_display (UDisksBlockDevice *block,
                    * but not automatically unlocked at boot time.
                    * This string is shown next to the label "Configured".
                    */
-                  g_string_append (str, _("Yes, at system startup"));
+                  g_string_append (str, _("Yes (unlocked at system startup)"));
                 }
             }
         }