diff --git a/ChangeLog b/ChangeLog
index effff246e4..110b18466b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-07-05  Tor Lillqvist  <tml@iki.fi>
+
+	* app/user_install.c (user_install_resolution): Use "windowing
+	system" instead of "X-server".
+
 2000-07-04  Sven Neumann  <sven@gimp.org>
 
 	* app/tips_dialog.c: corrected an error message 
diff --git a/app/dialogs/user-install-dialog.c b/app/dialogs/user-install-dialog.c
index 7f8150445c..e42b588391 100644
--- a/app/dialogs/user-install-dialog.c
+++ b/app/dialogs/user-install-dialog.c
@@ -1349,14 +1349,14 @@ user_install_resolution (void)
   gdisplay_xserver_resolution (&xres, &yres);
 
   add_label (GTK_BOX (resolution_page),
-	     _("GIMP can obtain this information from your X-server.\n"
-	       "However, most X-servers do not return useful values."));
+	     _("GIMP can obtain this information from the windowing system.\n"
+	       "However, usually this does not give useful values."));
   
   hbox = gtk_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (resolution_page), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  str = g_strdup_printf (_("Get Resolution from X-server (Currently %d x %d dpi)"),
+  str = g_strdup_printf (_("Get Resolution from windowing system (Currently %d x %d dpi)"),
 			 ROUND (xres), ROUND (yres));
   xserver_toggle = gtk_check_button_new_with_label (str);
   g_free (str);
diff --git a/app/gui/user-install-dialog.c b/app/gui/user-install-dialog.c
index 7f8150445c..e42b588391 100644
--- a/app/gui/user-install-dialog.c
+++ b/app/gui/user-install-dialog.c
@@ -1349,14 +1349,14 @@ user_install_resolution (void)
   gdisplay_xserver_resolution (&xres, &yres);
 
   add_label (GTK_BOX (resolution_page),
-	     _("GIMP can obtain this information from your X-server.\n"
-	       "However, most X-servers do not return useful values."));
+	     _("GIMP can obtain this information from the windowing system.\n"
+	       "However, usually this does not give useful values."));
   
   hbox = gtk_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (resolution_page), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  str = g_strdup_printf (_("Get Resolution from X-server (Currently %d x %d dpi)"),
+  str = g_strdup_printf (_("Get Resolution from windowing system (Currently %d x %d dpi)"),
 			 ROUND (xres), ROUND (yres));
   xserver_toggle = gtk_check_button_new_with_label (str);
   g_free (str);
diff --git a/app/user_install.c b/app/user_install.c
index 7f8150445c..e42b588391 100644
--- a/app/user_install.c
+++ b/app/user_install.c
@@ -1349,14 +1349,14 @@ user_install_resolution (void)
   gdisplay_xserver_resolution (&xres, &yres);
 
   add_label (GTK_BOX (resolution_page),
-	     _("GIMP can obtain this information from your X-server.\n"
-	       "However, most X-servers do not return useful values."));
+	     _("GIMP can obtain this information from the windowing system.\n"
+	       "However, usually this does not give useful values."));
   
   hbox = gtk_hbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (resolution_page), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  str = g_strdup_printf (_("Get Resolution from X-server (Currently %d x %d dpi)"),
+  str = g_strdup_printf (_("Get Resolution from windowing system (Currently %d x %d dpi)"),
 			 ROUND (xres), ROUND (yres));
   xserver_toggle = gtk_check_button_new_with_label (str);
   g_free (str);