change X-windows to X window

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2805 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/frontends/support/LyXImage_X.h b/src/frontends/support/LyXImage_X.h
index 78773a0113f2800aef80aecd80de18a24e34108c..021cd74c9448b53a561b3f791353276ca9a9bc07 100644 (file)
--- a/src/frontends/support/LyXImage_X.h
+++ b/src/frontends/support/LyXImage_X.h
@@ -15,7 +15,7 @@
 #include "frontends/support/LyXImage.h"
 #include <X11/Xlib.h>
 
-// This class actually acts as a base class when X-Windows is used.
+// This class actually acts as a base class when X Window is used.
 
 class LyXImage {
 public:

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 65a0507f4b1f1093f1741da7bf01a86f1e0772ac..a6e9bc76118702dfdd5f3f7decd1a7d4d9f9bff2 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2001-09-27  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * forms/form_preferences.fd: fix typo
+
 2001-09-24  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * FormRef.C:

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 0e3162bdbb5091a916cfbb26dce33a6b5ba55603..084db72967ed0e9eeb1b7d5546acaa69641ab480 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -148,7 +148,7 @@ void FormPreferences::ok()
 void FormPreferences::hide()
 {
        // We need to hide the active tabfolder otherwise we get a
-       // BadDrawable error from X windows and LyX crashes without saving.
+       // BadDrawable error from X window and LyX crashes without saving.
        FL_FORM * outer_form = fl_get_active_folder(dialog_->tabfolder_prefs);
        if (outer_form
            && outer_form->visible) {

diff --git a/src/frontends/xforms/form_preferences.C b/src/frontends/xforms/form_preferences.C
index be9d00d4216680e13c4e4ab7d3dcc6bfaf5f5a22..e9ed736986b14ab9808050da8a6cea8fd342d6b8 100644 (file)
--- a/src/frontends/xforms/form_preferences.C
+++ b/src/frontends/xforms/form_preferences.C
@@ -232,7 +232,7 @@ FD_form_interface * FormPreferences::build_interface()
     fl_set_object_lsize(obj, FL_NORMAL_SIZE);
     fl_set_object_callback(obj, C_FormBaseDeprecatedInputCB, 0);
   {
-    char const * const dummy = N_("Override X-Windows dead-keys|#O");
+    char const * const dummy = N_("Override X Window dead-keys|#O");
     fdui->check_override_x_dead_keys = obj = fl_add_checkbutton(FL_PUSH_BUTTON, 95, 265, 30, 30, idex(_(dummy)));
     fl_set_button_shortcut(obj, scex(_(dummy)), 1);
   }

diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index 4845004b6167158c7196a40faac72abe1b5b5e68..4ca38aee5c1cf81cd020fb998d9c729ac5114b27 100644 (file)
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -752,7 +752,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Override X-Windows dead-keys|#O
+label: Override X Window dead-keys|#O
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity