Martin Vermeer wrote:

I changed a couple of messages (mainly concerning the Box dialog) to "harmonize" the dialogs. Could you please check and apply the patch? Thanks in advance.

I like these short patches... don't consume unnecessary bandwidth.

Oh, I forgot the attachment! Here it comes...


Michael
Index: lib/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/lib/ChangeLog,v
retrieving revision 1.543
diff -u -r1.543 ChangeLog
--- lib/ChangeLog       2003/11/27 16:52:07     1.543
+++ lib/ChangeLog       2003/11/28 11:00:27
@@ -1,3 +1,7 @@
+2003-11-28  Michael Schmitt  <[EMAIL PROTECTED]>
+
+       * layouts/chess.layout: Remove blanks in style name
+
 2003-11-27  Martin Vermeer  <[EMAIL PROTECTED]>
 
        * layouts/db_stdclass.inc:
Index: lib/layouts/chess.layout
===================================================================
RCS file: /cvs/lyx/lyx-devel/lib/layouts/chess.layout,v
retrieving revision 1.6
diff -u -r1.6 chess.layout
--- lib/layouts/chess.layout    2003/10/13 09:50:09     1.6
+++ lib/layouts/chess.layout    2003/11/28 11:00:29
@@ -81,7 +81,7 @@
 
 
 # This is a subsubsubvariation.
-Style                   SubVariation3
+Style SubVariation3
        CopyStyle             Variation
        LatexName             lyxvariation[4]
        LabelString           "Subvariation(3): "
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.846
diff -u -r1.846 ChangeLog
--- src/frontends/xforms/ChangeLog      2003/11/21 11:38:17     1.846
+++ src/frontends/xforms/ChangeLog      2003/11/28 11:01:10
@@ -1,3 +1,11 @@
+2003-11-28  Michael Schmitt  <[EMAIL PROTECTED]>
+
+       * src/frontends/xforms/forms/form_box.fd:
+       * src/frontends/xforms/FormMinipage.C:
+       * src/frontends/xforms/FormDocument.C:
+       * src/frontends/xforms/FormBox.C: fix capitalization in
+       messages; harmonize messages of different dialogs
+
 2003-11-14  Jean-Marc Lasgouttes  <[EMAIL PROTECTED]>
 
        * forms/form_maths_panel.fd (label): replace label "Greek" by
Index: src/frontends/xforms/FormBox.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormBox.C,v
retrieving revision 1.2
diff -u -r1.2 FormBox.C
--- src/frontends/xforms/FormBox.C      2003/10/13 09:43:14     1.2
+++ src/frontends/xforms/FormBox.C      2003/11/28 11:01:11
@@ -71,21 +71,21 @@
        bcview().addReadOnly(dialog_->radio_minipage);
 
        bcview().addReadOnly(dialog_->choice_pos);
-       fl_addto_choice(dialog_->choice_pos, _("top").c_str());
-       fl_addto_choice(dialog_->choice_pos, _("middle").c_str());
-       fl_addto_choice(dialog_->choice_pos, _("bottom").c_str());
+       fl_addto_choice(dialog_->choice_pos, _("Top").c_str());
+       fl_addto_choice(dialog_->choice_pos, _("Middle").c_str());
+       fl_addto_choice(dialog_->choice_pos, _("Bottom").c_str());
 
        bcview().addReadOnly(dialog_->choice_inner_pos);
-       fl_addto_choice(dialog_->choice_inner_pos, _("top").c_str());
-       fl_addto_choice(dialog_->choice_inner_pos, _("middle").c_str());
-       fl_addto_choice(dialog_->choice_inner_pos, _("bottom").c_str());
-       fl_addto_choice(dialog_->choice_inner_pos, _("stretch").c_str());
+       fl_addto_choice(dialog_->choice_inner_pos, _("Top").c_str());
+       fl_addto_choice(dialog_->choice_inner_pos, _("Middle").c_str());
+       fl_addto_choice(dialog_->choice_inner_pos, _("Bottom").c_str());
+       fl_addto_choice(dialog_->choice_inner_pos, _("Stretch").c_str());
 
        bcview().addReadOnly(dialog_->choice_hor_pos);
-       fl_addto_choice(dialog_->choice_hor_pos, _("left").c_str());
-       fl_addto_choice(dialog_->choice_hor_pos, _("center").c_str());
-       fl_addto_choice(dialog_->choice_hor_pos, _("right").c_str());
-       fl_addto_choice(dialog_->choice_hor_pos, _("stretch").c_str());
+       fl_addto_choice(dialog_->choice_hor_pos, _("Left").c_str());
+       fl_addto_choice(dialog_->choice_hor_pos, _("Center").c_str());
+       fl_addto_choice(dialog_->choice_hor_pos, _("Right").c_str());
+       fl_addto_choice(dialog_->choice_hor_pos, _("Stretch").c_str());
 
        bcview().addReadOnly(dialog_->input_width);
        bcview().addReadOnly(dialog_->choice_width_unit);
@@ -261,7 +261,7 @@
                string const input = getString(dialog_->input_width);
                bool const invalid = !isValidLength(input) && !isStrDbl(input);
                if (invalid) {
-                       postWarning(_("Invalid Length!"));
+                       postWarning(_("Invalid length!"));
                        return ButtonPolicy::SMI_INVALID;
                }
        }
@@ -269,7 +269,7 @@
                string const input = getString(dialog_->input_height);
                bool const invalid = !isValidLength(input) && !isStrDbl(input);
                if (invalid) {
-                       postWarning(_("Invalid Length!"));
+                       postWarning(_("Invalid length!"));
                        return ButtonPolicy::SMI_INVALID;
                }
        }
Index: src/frontends/xforms/FormDocument.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormDocument.C,v
retrieving revision 1.162
diff -u -r1.162 FormDocument.C
--- src/frontends/xforms/FormDocument.C 2003/11/21 11:38:17     1.162
+++ src/frontends/xforms/FormDocument.C 2003/11/28 11:01:14
@@ -309,7 +309,7 @@
        fl_set_input_return(options_->input_float_placement, FL_RETURN_CHANGED);
 
        fl_addto_choice(options_->choice_ams_math,
-                       _("Never | Automatically | Yes ").c_str());
+                       _(" Never | Automatically | Yes ").c_str());
 
        for (int n = 0; tex_graphics[n][0]; ++n) {
                fl_addto_choice(options_->choice_postscript_driver,
Index: src/frontends/xforms/FormMinipage.C
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/FormMinipage.C,v
retrieving revision 1.40
diff -u -r1.40 FormMinipage.C
--- src/frontends/xforms/FormMinipage.C 2003/10/06 15:42:55     1.40
+++ src/frontends/xforms/FormMinipage.C 2003/11/28 11:01:14
@@ -118,7 +118,7 @@
                string const input = getString(dialog_->input_width);
                bool const invalid = !isValidLength(input) && !isStrDbl(input);
                if (invalid) {
-                       postWarning(_("Invalid Length!"));
+                       postWarning(_("Invalid length!"));
                        action = ButtonPolicy::SMI_INVALID;
                } else {
                        action = ButtonPolicy::SMI_VALID;
Index: src/frontends/xforms/forms/form_box.fd
===================================================================
RCS file: /cvs/lyx/lyx-devel/src/frontends/xforms/forms/form_box.fd,v
retrieving revision 1.1
diff -u -r1.1 form_box.fd
--- src/frontends/xforms/forms/form_box.fd      2003/10/07 07:42:13     1.1
+++ src/frontends/xforms/forms/form_box.fd      2003/11/28 11:01:15
@@ -131,7 +131,7 @@
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Vertical Position
+label: Vertical Alignment
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -257,7 +257,7 @@
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Inner Position (Vert.)
+label: Inner Alignment (Vert.)
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -275,7 +275,7 @@
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Horizontal Position
+label: Horizontal Alignment
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

Reply via email to