summaryrefslogtreecommitdiff
path: root/capplets/common
diff options
context:
space:
mode:
authorKjartan Maraas <kmaraas@gnome.org>2002-03-17 22:15:14 +0000
committerKjartan Maraas <kmaraas@src.gnome.org>2002-03-17 22:15:14 +0000
commite9b57b010f3a558397cae84f548c32897a113963 (patch)
tree6c255c8f0076c5400f670e2f0b743240beb9c9d1 /capplets/common
parent7a64b591a75bae6bc4eefce523a4fd2605957146 (diff)
downloadgnome-control-center-e9b57b010f3a558397cae84f548c32897a113963.tar.gz
Mark a string. #include <config.h>
2002-03-17 Kjartan Maraas <kmaraas@gnome.org> * activate-settings-daemon.c: Mark a string. #include <config.h>
Diffstat (limited to 'capplets/common')
-rw-r--r--capplets/common/ChangeLog4
-rw-r--r--capplets/common/activate-settings-daemon.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/capplets/common/ChangeLog b/capplets/common/ChangeLog
index 8bb529a3b..da9deae8c 100644
--- a/capplets/common/ChangeLog
+++ b/capplets/common/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-17 Kjartan Maraas <kmaraas@gnome.org>
+
+ * activate-settings-daemon.c: Mark a string. #include <config.h>
+
2002-03-17 Jonathan Blandford <set EMAIL_ADDRESS environment variable>
reviewed by: <delete if not using a buddy>
diff --git a/capplets/common/activate-settings-daemon.c b/capplets/common/activate-settings-daemon.c
index 8f08a92b1..7d78683ec 100644
--- a/capplets/common/activate-settings-daemon.c
+++ b/capplets/common/activate-settings-daemon.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <libbonobo.h>
#include <gtk/gtk.h>
@@ -11,7 +15,7 @@ static void popup_error_message ()
GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_NO_SEPARATOR, GTK_MESSAGE_WARNING,
- GTK_BUTTONS_OK, "Unable to start the settings manager 'gnome2-settings-daemon'.\n"
+ GTK_BUTTONS_OK, _("Unable to start the settings manager 'gnome2-settings-daemon'.\n"
"Without the GNOME settings manager running, some preferences may not take effect. This could"
"indicate a problem with Bonobo, or a non-GNOME (e.g. KDE) settings manager may already"
"be active and conflicting with the GNOME settings manager.");