Change so that messages in the .po files do not contain unneccessary

Mon Jul 07 12:41:21 2003  George Lebl <jirka@5z.com>

	* gui/gdmsetup.(c|glade), gui/gdmcomm.c, gui/gdmphotosetup.c: Change
	  so that messages in the .po files do not contain unneccessary
	  markup.  Fixes #101794 and #101795

	* config/Makefile.am: make the /etc/X11/dm dir if it doesn't exist
	  fixes #116836

7 files changed, 94 insertions, 59 deletions

diff --git a/ChangeLog b/ChangeLog
index e2cd8ed4..f41ca1fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jul 07 12:41:21 2003  George Lebl <jirka@5z.com>
+
+	* gui/gdmsetup.(c|glade), gui/gdmcomm.c, gui/gdmphotosetup.c: Change
+	  so that messages in the .po files do not contain unneccessary
+	  markup.  Fixes #101794 and #101795
+
+	* config/Makefile.am: make the /etc/X11/dm dir if it doesn't exist
+	  fixes #116836
+
 Thu Jul 03 14:57:38 2003  George Lebl <jirka@5z.com>
 
 	* daemon/errorgui.c: the details file is read first, capped at 500
diff --git a/config/Makefile.am b/config/Makefile.am
index b9665499..4db3cbd8 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,5 +1,6 @@
 pixmapdir = $(datadIR)/pixmaps
 confdir = $(sysconfdir)/gdm
+crossconfdir = $(sysconfdir)/dm
 localedir = $(sysconfdir)/gdm
 sessdir = $(sysconfdir)/dm/Sessions
 initdir = $(sysconfdir)/gdm/Init
@@ -39,6 +40,10 @@ install-data-hook: gdm.conf Xsession gnome.desktop Default.desktop CDE.desktop D
 		$(mkinstalldirs) $(DESTDIR)$(confdir); \
 		chmod 755 $(DESTDIR)$(confdir); \
 	fi
+	if test '!' -d $(DESTDIR)$(crossconfdir); then \
+		$(mkinstalldirs) $(DESTDIR)$(crossconfdir); \
+		chmod 755 $(DESTDIR)$(crossconfdir); \
+	fi
 	-if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \
 		cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/gdm.conf.orig; \
 		$(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/gdm.conf; \
diff --git a/gui/gdmcomm.c b/gui/gdmcomm.c
index 32a06be7..14824947 100644
--- a/gui/gdmcomm.c
+++ b/gui/gdmcomm.c
@@ -384,6 +384,7 @@ gdmcomm_check (gboolean gui_bitching)
 	    (kill (pid, 0) < 0 &&
 	     errno != EPERM)) {
 		if (gui_bitching) {
+			char *s;
 			dialog = gtk_message_dialog_new
 				(NULL /* parent */,
 				 GTK_DIALOG_MODAL /* flags */,
@@ -391,16 +392,19 @@ gdmcomm_check (gboolean gui_bitching)
 				 GTK_BUTTONS_OK,
 				 "foo");
 			gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
-			gtk_label_set_markup
-				 (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
-				  _("<b>GDM (The GNOME Display Manager) "
-				    "is not running.</b>\n\n"
-				    "You might in fact be using a different "
+			s = g_strdup_printf ("<b>%s</b>\n\n%s\n%s",
+				  _("GDM (The GNOME Display Manager) "
+				    "is not running."),
+				  _("You might in fact be using a different "
 				    "display manager, such as KDM "
-				    "(KDE Display Manager or xdm).\n"
-				    "If you still wish to use this feature, "
-				    "either start GDM your self or ask your "
+				    "(KDE Display Manager or xdm)."),
+				  _("If you still wish to use this feature, "
+				    "either start GDM yourself or ask your "
 				    "system administrator to start GDM."));
+			gtk_label_set_markup
+				 (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
+				  s);
+			g_free (s);
 			gtk_widget_show_all (dialog);
 			gtk_dialog_run (GTK_DIALOG (dialog));
 			gtk_widget_destroy (dialog);
diff --git a/gui/gdmphotosetup.c b/gui/gdmphotosetup.c
index fdfe197d..83992cda 100644
--- a/gui/gdmphotosetup.c
+++ b/gui/gdmphotosetup.c
@@ -57,6 +57,7 @@ gdm_check (void)
 	if (pid <= 1 ||
 	    (kill (pid, 0) < 0 &&
 	     errno != EPERM)) {
+		char *s;
 		dialog = gtk_message_dialog_new
 			(NULL /* parent */,
 			 GTK_DIALOG_MODAL /* flags */,
@@ -64,16 +65,18 @@ gdm_check (void)
 			 GTK_BUTTONS_OK,
 			 "foo");
 		gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
+		s = g_strdup_printf ("<b>%s</b>\n\n%s\n%s",
+				     _("GDM (The GNOME Display Manager) "
+				       "is not running."),
+				     _("You might in fact be using a different "
+				       "display manager, such as KDM "
+				       "(KDE Display Manager or xdm)."),
+				     _("If you still wish to use this feature, "
+				       "either start GDM yourself or ask your "
+				       "system administrator to start GDM."));
 		gtk_label_set_markup
 			 (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
-			  _("<b>GDM (The GNOME Display Manager) "
-			    "is not running.</b>\n\n"
-			    "You might in fact be using a different "
-			    "display manager, such as KDM "
-			    "(KDE Display Manager or xdm).\n"
-			    "If you still wish to use this feature, "
-			    "either start GDM your self or ask your "
-			    "system administrator to start GDM."));
+			  s);
 		gtk_widget_show_all (dialog);
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);
diff --git a/gui/gdmsetup-strings.c b/gui/gdmsetup-strings.c
index 17d8e6b3..e8a96405 100644
--- a/gui/gdmsetup-strings.c
+++ b/gui/gdmsetup-strings.c
@@ -1,11 +1,11 @@
 /*
  * Soubor s přeložitelnými řetězci generovaný programem Glade.
- * Přidejte tento soubor do POTFILES.in svého projektu.
- * NEPŘEKLÁDEJTE JEJ jako součást své aplikace.
+ * Přidejte tento soubor do souboru vašeho projektu POTFILES.in.
+ * NEPŘEKLÁDEJTE JEJ jako součást vaší aplikace.
  */
 
 gchar *s = N_("Login Screen Setup");
-gchar *s = N_("<b>Greeter</b>");
+gchar *s = N_("Greeter");
 gchar *s = N_("    ");
 gchar *s = N_("L_ocal: ");
 gchar *s = N_("_Remote: ");
@@ -20,25 +20,25 @@ gchar *s = N_("*");
 gchar *s = N_("String to be shown in the greeter for people logging in remotely with XDMCP.  You can insert %n in here and it will be replaced by the name of your computer.");
 gchar *s = N_("*");
 gchar *s = N_("Always use 24 hour cloc_k format");
-gchar *s = N_("<b>Automatic Login</b>");
+gchar *s = N_("Automatic Login");
 gchar *s = N_("    ");
 gchar *s = N_("_Automatic login username:");
 gchar *s = N_("*");
 gchar *s = N_("_Login a user automatically on first bootup");
-gchar *s = N_("<b>Timed Login</b>");
+gchar *s = N_("Timed Login");
 gchar *s = N_("    ");
 gchar *s = N_("Timed login us_ername:");
 gchar *s = N_("_Seconds before login:");
 gchar *s = N_("*");
 gchar *s = N_("Login a user automa_tically after a specified number of seconds");
 gchar *s = N_("General");
-gchar *s = N_("<b>Logo</b>");
+gchar *s = N_("Logo");
 gchar *s = N_("    ");
 gchar *s = N_("*");
-gchar *s = N_("<b>Miscellaneous</b>");
+gchar *s = N_("Miscellaneous");
 gchar *s = N_("    ");
 gchar *s = N_("Show choosable user images (_face browser)");
-gchar *s = N_("<b>Background</b>");
+gchar *s = N_("Background");
 gchar *s = N_("    ");
 gchar *s = N_("_No background");
 gchar *s = N_("_Image");
@@ -49,11 +49,11 @@ gchar *s = N_("_Only color on remote displays");
 gchar *s = N_("_Background color: ");
 gchar *s = N_("Pick a color");
 gchar *s = N_("Standard greeter");
-gchar *s = N_("<b>Preview:</b>");
+gchar *s = N_("Preview:");
 gchar *s = N_("No screenshot available");
-gchar *s = N_("<b>Description:</b>");
-gchar *s = N_("<b>Copyright:</b>");
-gchar *s = N_("<b>Author:</b>");
+gchar *s = N_("Description:");
+gchar *s = N_("Copyright:");
+gchar *s = N_("Author:");
 gchar *s = N_("description\n"
               "widget");
 gchar *s = N_("author");
@@ -61,7 +61,7 @@ gchar *s = N_("copyright");
 gchar *s = N_("_Install new theme");
 gchar *s = N_("_Delete theme");
 gchar *s = N_("Graphical greeter");
-gchar *s = N_("<b>Options</b>");
+gchar *s = N_("Options");
 gchar *s = N_("    ");
 gchar *s = N_("Allow _root to login with GDM");
 gchar *s = N_("Allow root to login r_emotely with GDM");
@@ -74,7 +74,7 @@ gchar *s = N_("Always disallow TCP connections to _X server");
 gchar *s = N_("Retry _delay (seconds) :");
 gchar *s = N_("Security");
 gchar *s = N_("No XDMCP support in the binary.  To enable XDMCP support you must recompile GDM with the XDMCP libraries.");
-gchar *s = N_("<b>Enable _XDMCP</b>");
+gchar *s = N_("Enable _XDMCP");
 gchar *s = N_("    ");
 gchar *s = N_("Honour _indirect requests");
 gchar *s = N_("Listen on _UDP port: ");
diff --git a/gui/gdmsetup.c b/gui/gdmsetup.c
index 1729e46a..585c4a3d 100644
--- a/gui/gdmsetup.c
+++ b/gui/gdmsetup.c
@@ -863,10 +863,6 @@ setup_xdmcp_support (void)
 	gtk_widget_show (xdmcp_vbox);
 #endif /* HAVE_LIBXDMCP */
 
-	/* Why doesn't glade have this? */
-	gtk_label_set_use_markup (GTK_LABEL (GTK_BIN (xdmcp_toggle)->child),
-				  TRUE);
-
 	gtk_widget_set_sensitive (xdmcp_frame, 
 				  GTK_TOGGLE_BUTTON (xdmcp_toggle)->active);
 
@@ -1947,6 +1943,24 @@ setup_gui (void)
 	g_signal_connect (G_OBJECT (dialog), "response",
 			  G_CALLBACK (dialog_response), NULL);
 
+	/* setup bold thingies */
+	glade_helper_tagify_label (xml, "greeter_cat_label", "b");
+	glade_helper_tagify_label (xml, "autologin_cat_label", "b");
+	glade_helper_tagify_label (xml, "timedlogin_cat_label", "b");
+
+	glade_helper_tagify_label (xml, "sg_logo_cat_label", "b");
+	glade_helper_tagify_label (xml, "sg_background_cat_label", "b");
+	glade_helper_tagify_label (xml, "sg_misc_cat_label", "b");
+
+	glade_helper_tagify_label (xml, "options_cat_label", "b");
+
+	glade_helper_tagify_label (xml, "gg_preview_cat_label", "b");
+	glade_helper_tagify_label (xml, "gg_author_label", "b");
+	glade_helper_tagify_label (xml, "gg_desc_label", "b");
+	glade_helper_tagify_label (xml, "gg_copyright_label", "b");
+
+	glade_helper_tagify_label (xml, "enable_xdmcp", "b");
+
 	setup_xdmcp_support ();
 	setup_background_support ();
 	setup_greeter_backselect ();
diff --git a/gui/gdmsetup.glade b/gui/gdmsetup.glade
index dff97f51..0b12e9c2 100644
--- a/gui/gdmsetup.glade
+++ b/gui/gdmsetup.glade
@@ -81,9 +81,9 @@
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label36">
+		    <widget class="GtkLabel" id="greeter_cat_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Greeter&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Greeter</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -430,9 +430,9 @@
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label38">
+		    <widget class="GtkLabel" id="autologin_cat_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Automatic Login&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Automatic Login</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -501,8 +501,8 @@
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">autologin_entry</property>
 			      <accessibility>
-				<atkrelation target="autologin_entry" type="label-for"/>
 				<atkrelation target="autologin_combo" type="label-for"/>
+				<atkrelation target="autologin_entry" type="label-for"/>
 			      </accessibility>
 			    </widget>
 			    <packing>
@@ -610,9 +610,9 @@
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label42">
+		    <widget class="GtkLabel" id="timedlogin_cat_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Timed Login&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Timed Login</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -681,8 +681,8 @@
 			      <property name="ypad">0</property>
 			      <property name="mnemonic_widget">timedlogin_entry</property>
 			      <accessibility>
-				<atkrelation target="timedlogin_entry" type="label-for"/>
 				<atkrelation target="timedlogin_combo" type="label-for"/>
+				<atkrelation target="timedlogin_entry" type="label-for"/>
 			      </accessibility>
 			    </widget>
 			    <packing>
@@ -881,9 +881,9 @@
 		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label44">
+			<widget class="GtkLabel" id="sg_logo_cat_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Logo&lt;/b&gt;</property>
+			  <property name="label" translatable="yes">Logo</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -991,9 +991,9 @@
 		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label48">
+			<widget class="GtkLabel" id="sg_misc_cat_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Miscellaneous&lt;/b&gt;</property>
+			  <property name="label" translatable="yes">Miscellaneous</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1104,9 +1104,9 @@
 		      <property name="spacing">6</property>
 
 		      <child>
-			<widget class="GtkLabel" id="label52">
+			<widget class="GtkLabel" id="sg_background_cat_label">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;b&gt;Background&lt;/b&gt;</property>
+			  <property name="label" translatable="yes">Background</property>
 			  <property name="use_underline">False</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1469,9 +1469,9 @@
 				  <property name="spacing">4</property>
 
 				  <child>
-				    <widget class="GtkLabel" id="label30">
+				    <widget class="GtkLabel" id="gg_preview_cat_label">
 				      <property name="visible">True</property>
-				      <property name="label" translatable="yes">&lt;b&gt;Preview:&lt;/b&gt;</property>
+				      <property name="label" translatable="yes">Preview:</property>
 				      <property name="use_underline">False</property>
 				      <property name="use_markup">True</property>
 				      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1540,9 +1540,9 @@
 				      <property name="column_spacing">3</property>
 
 				      <child>
-					<widget class="GtkLabel" id="label32">
+					<widget class="GtkLabel" id="gg_desc_label">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">&lt;b&gt;Description:&lt;/b&gt;</property>
+					  <property name="label" translatable="yes">Description:</property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">True</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1564,9 +1564,9 @@
 				      </child>
 
 				      <child>
-					<widget class="GtkLabel" id="label33">
+					<widget class="GtkLabel" id="gg_copyright_label">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">&lt;b&gt;Copyright:&lt;/b&gt;</property>
+					  <property name="label" translatable="yes">Copyright:</property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">True</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1588,9 +1588,9 @@
 				      </child>
 
 				      <child>
-					<widget class="GtkLabel" id="label31">
+					<widget class="GtkLabel" id="gg_author_label">
 					  <property name="visible">True</property>
-					  <property name="label" translatable="yes">&lt;b&gt;Author:&lt;/b&gt;</property>
+					  <property name="label" translatable="yes">Author:</property>
 					  <property name="use_underline">False</property>
 					  <property name="use_markup">True</property>
 					  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1791,9 +1791,9 @@ widget</property>
 		  <property name="spacing">6</property>
 
 		  <child>
-		    <widget class="GtkLabel" id="label34">
+		    <widget class="GtkLabel" id="options_cat_label">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Options&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Options</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">True</property>
 		      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2116,7 +2116,7 @@ widget</property>
 		    <widget class="GtkCheckButton" id="enable_xdmcp">
 		      <property name="visible">True</property>
 		      <property name="can_focus">True</property>
-		      <property name="label" translatable="yes">&lt;b&gt;Enable _XDMCP&lt;/b&gt;</property>
+		      <property name="label" translatable="yes">Enable _XDMCP</property>
 		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NORMAL</property>
 		      <property name="active">False</property>