Index: src/gfloppy2.glade
===================================================================
RCS file: /cvs/gnome/gfloppy/src/gfloppy2.glade,v
retrieving revision 1.14
diff -u -r1.14 gfloppy2.glade
--- src/gfloppy2.glade	30 May 2003 20:53:34 -0000	1.14
+++ src/gfloppy2.glade	15 Jan 2005 04:10:35 -0000
@@ -34,11 +34,11 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label17">
+		<widget class="GtkLabel" id="physical_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Physical Settings&lt;/span&gt;</property>
+		  <property name="label" translatable="yes">Physical Settings</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -269,11 +269,11 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label20">
+		<widget class="GtkLabel" id="filesystem_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Filesystem Settings&lt;/span&gt;</property>
+		  <property name="label" translatable="yes">Filesystem Settings</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
@@ -493,11 +493,11 @@
 	      <property name="spacing">6</property>
 
 	      <child>
-		<widget class="GtkLabel" id="label21">
+		<widget class="GtkLabel" id="formatting_label">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">&lt;span weight=&quot;bold&quot;&gt;Formatting Mode&lt;/span&gt;</property>
+		  <property name="label" translatable="yes">Formatting Mode</property>
 		  <property name="use_underline">False</property>
-		  <property name="use_markup">True</property>
+		  <property name="use_markup">False</property>
 		  <property name="justify">GTK_JUSTIFY_LEFT</property>
 		  <property name="wrap">False</property>
 		  <property name="selectable">False</property>
Index: src/main.c
===================================================================
RCS file: /cvs/gnome/gfloppy/src/main.c,v
retrieving revision 1.57
diff -u -r1.57 main.c
--- src/main.c	24 Nov 2004 17:13:30 -0000	1.57
+++ src/main.c	15 Jan 2005 04:10:36 -0000
@@ -527,6 +527,7 @@
 	GtkWidget *label;
 	GtkSizeGroup *size_group;
 	GSList *l;
+	gchar *label_text;
         gint base_size;
 
 
@@ -567,8 +568,6 @@
 	if (xml == NULL)
 		g_error ("Cannot load/find gfloppy2.glade");
 
-	init_devices (ctx);
-
 	/* We get the different widgets */
 	
 	toplevel = glade_xml_get_widget (xml, "toplevel");
@@ -628,6 +627,22 @@
 	default_mode_rb = (GtkWidget *) g_slist_nth (l, GFLOPPY_FORMAT_THOROUGH - config.default_formatting_mode)->data;
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (default_mode_rb), TRUE);
 
+	/* bold header labels per HIG; done here to avoid markup in translations */
+	label = glade_xml_get_widget (xml, "physical_label");
+	label_text = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>", gtk_label_get_text (GTK_LABEL (label)));
+	gtk_label_set_markup (GTK_LABEL (label), label_text);
+	g_free (label_text);
+
+	label = glade_xml_get_widget (xml, "filesystem_label");
+	label_text = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>", gtk_label_get_text (GTK_LABEL (label)));
+	gtk_label_set_markup (GTK_LABEL (label), label_text);
+	g_free (label_text);
+
+	label = glade_xml_get_widget (xml, "formatting_label");
+	label_text = g_markup_printf_escaped ("<span weight=\"bold\">%s</span>", gtk_label_get_text (GTK_LABEL (label)));
+	gtk_label_set_markup (GTK_LABEL (label), label_text);
+	g_free (label_text);
+
 	/* check the UI consistency for a couple of settings */
 	g_signal_emit_by_name (type_option, "changed", NULL);
 
@@ -655,6 +670,8 @@
 		gtk_label_set_mnemonic_widget (GTK_LABEL(label), GTK_WIDGET(fs_entry));
 	}
 
+	init_devices (ctx);
+
 	gtk_widget_show (GTK_WIDGET (toplevel));
 
 	gtk_main ();
