[gnome-disk-utility] rework terminology for filesystem labels / partition labels

[David Zeuthen <davidz src gnome org>]

commit 151f0f353577494f37e9753183f1335712dfd903
Author: David Zeuthen <davidz redhat com>
Date:   Fri Mar 27 14:04:24 2009 -0400

    rework terminology for filesystem labels / partition labels
    
    This is another iteration of this bug
    
    http://bugzilla.gnome.org/show_bug.cgi?id=576929#c6
---
 HACKING                                   |   11 +++++++++--
 src/palimpsest/gdu-section-filesystem.c   |    2 +-
 src/palimpsest/gdu-section-partition.c    |    2 +-
 src/palimpsest/gdu-section-unallocated.c  |    2 +-
 src/palimpsest/gdu-section-unrecognized.c |    2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/HACKING b/HACKING
index cbf932e..2c3d26d 100644
--- a/HACKING
+++ b/HACKING
@@ -64,8 +64,15 @@ different terminology is used.
 In Palimpsest the following terminology is used
 
  - Partition/Partition Table
-
- - File system/Label/UUID
+   - Avoid using terms that are used for other concepts; e.g.
+     use "Partition Label" instead of "Label"
+
+ - Filesystem
+   - Use the spelling "Filesystem"
+     - http://en.wiktionary.org/wiki/filesystem
+   - Use the word "Label" when referring to a filesystem label
+   - Generally refer to a filesystem by it's label
+   - Don't show/reference the UUID (might be shown in a "Details" dialog)
 
  - Disk: Only to be used when referring to the entirety of a
          device; e.g. avoid using it for individual things
diff --git a/src/palimpsest/gdu-section-filesystem.c b/src/palimpsest/gdu-section-filesystem.c
index 111e6a2..7e4a31b 100644
--- a/src/palimpsest/gdu-section-filesystem.c
+++ b/src/palimpsest/gdu-section-filesystem.c
@@ -266,7 +266,7 @@ gdu_section_filesystem_init (GduSectionFilesystem *section)
         /* file system label */
         label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Name:"));
+        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Label:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
         entry = gtk_entry_new ();
diff --git a/src/palimpsest/gdu-section-partition.c b/src/palimpsest/gdu-section-partition.c
index aed06af..b186744 100644
--- a/src/palimpsest/gdu-section-partition.c
+++ b/src/palimpsest/gdu-section-partition.c
@@ -544,7 +544,7 @@ gdu_section_partition_init (GduSectionPartition *section)
         /* partition label */
         label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Label:"));
+        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("Part_ition Label:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
         entry = gtk_entry_new ();
diff --git a/src/palimpsest/gdu-section-unallocated.c b/src/palimpsest/gdu-section-unallocated.c
index 06e96f8..acbce5f 100644
--- a/src/palimpsest/gdu-section-unallocated.c
+++ b/src/palimpsest/gdu-section-unallocated.c
@@ -697,7 +697,7 @@ gdu_section_unallocated_init (GduSectionUnallocated *section)
         /* _file system_ label */
         label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
-        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Name:"));
+        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Label:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
 
diff --git a/src/palimpsest/gdu-section-unrecognized.c b/src/palimpsest/gdu-section-unrecognized.c
index b2e0220..878aaf0 100644
--- a/src/palimpsest/gdu-section-unrecognized.c
+++ b/src/palimpsest/gdu-section-unrecognized.c
@@ -464,7 +464,7 @@ gdu_section_unrecognized_init (GduSectionUnrecognized *section)
         /* file system label */
         label = gtk_label_new (NULL);
         gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
-        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Name:"));
+        gtk_label_set_markup_with_mnemonic (GTK_LABEL (label), _("_Label:"));
         gtk_table_attach (GTK_TABLE (table), label, 0, 1, row, row + 1,
                           GTK_FILL, GTK_EXPAND | GTK_FILL, 2, 2);
         entry = gtk_entry_new ();