Minor bits 'n' bobs from Michael, J�rgen and Jean-Marc.

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 96dc015bb804241f9051104dec542405760f8edd..63f874fa25d9b2ec932aaeb6f1353d03ec76a3e7 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2003-01-06  Michael Schmitt <Michael.Schmitt@teststep.org>
+
+       * LColor.C:
+       * LaTeX.C:
+       * LyXAction.C:
+       * MenuBackend.C:
+       * buffer.C:
+       * exporter.C:
+       * lyxfunc.C:
+       * lyxrc.C: fix inconsistent usage of spaces, colons, capitalization,
+       and the like.
+
 2003-01-05  John Levon  <levon@movementarian.org>
 
        * BufferView.h:

diff --git a/src/LColor.C b/src/LColor.C
index c213c79fe8d85b3e79c5e34c667415b889d995fe..6420afde2e7ef896918175d4a6a2c6dba2636383 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -59,7 +59,7 @@ LColor::LColor()
        { background, N_("background"), "background", "linen", "background" },
        { foreground, N_("text"), "foreground", "black", "foreground" },
        { selection, N_("selection"), "selection", "LightBlue", "selection" },
-       { latex, N_("latex text"), "latex", "DarkRed", "latex" },
+       { latex, N_("LaTeX text"), "latex", "DarkRed", "latex" },
        { preview, N_("previewed snippet"), "preview", "black", "preview" },
        { note, N_("note"), "note", "yellow", "note" },
        { notebg, N_("note background"), "notebg", "yellow", "notebg" },

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 45355f8fdb6fd224d539aff55918cfe6233e5dc1..797b316b56b214f90b141ecb75e9abfcce09fb3d 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -472,7 +472,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
                                string database;
                                data = split(data, database, ',');
                                database = ChangeExtension(database, "bib");
-                               lyxerr[Debug::LATEX] << "Bibtex database: `"
+                               lyxerr[Debug::LATEX] << "BibTeX database: `"
                                                     << database << '\'' << endl;
                                aux_info.databases.insert(database);
                        }
@@ -481,7 +481,7 @@ void LaTeX::scanAuxFile(string const & file, Aux_Info & aux_info)
                        // token is now the style file
                        // pass it to the helper
                        style = ChangeExtension(style, "bst");
-                       lyxerr[Debug::LATEX] << "Bibtex style: `"
+                       lyxerr[Debug::LATEX] << "BibTeX style: `"
                                             << style << '\'' << endl;
                        aux_info.styles.insert(style);
                } else if (regex_match(STRCONV(token), sub, reg4)) {

diff --git a/src/LyXAction.C b/src/LyXAction.C
index 0d7f42f14cd38f5b23f6ea5b4bbdd07f1812563a..a2304e7018ac76373a61ed72f9d7c7f7dc8e0b82 100644 (file)
--- a/src/LyXAction.C
+++ b/src/LyXAction.C
@@ -106,7 +106,7 @@ void LyXAction::init()
                  N_("Select previous char"), ReadOnly },
                { LFUN_BIBDB_ADD, "bibtex-database-add", "", Noop },
                { LFUN_BIBDB_DEL, "bibtex-database-del", "", Noop },
-               { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert bibtex"),
+               { LFUN_INSERT_BIBTEX, "bibtex-insert", N_("Insert BibTeX"),
                  Noop },
                { LFUN_BIBTEX_STYLE, "bibtex-style", "", Noop },
                { LFUN_BOOKMARK_GOTO, "bookmark-goto", "", ReadOnly },

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index bd58b3ec213107f7188367823914b070ca8d87ce..5d5604dfd72c22efc90abf73ab9f82ac651cf800 100644 (file)
--- a/src/MenuBackend.C
+++ b/src/MenuBackend.C
@@ -375,9 +375,9 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, Buffer const * buf)
 
                if (kind == MenuItem::ImportFormats)
                        if ((*fit)->name() == "text")
-                               label = _("Ascii text as lines");
+                               label = _("ASCII text as lines");
                        else if ((*fit)->name() == "textparagraph")
-                               label = _("Ascii text as paragraphs");
+                               label = _("ASCII text as paragraphs");
                if (!(*fit)->shortcut().empty())
                        label += '|' + (*fit)->shortcut();
                int const action2 = lyxaction.

diff --git a/src/buffer.C b/src/buffer.C
index 31dd511ea82498cc36963b029ee4c02b06d29b8a..2197e6e9dfde884d3ea742afbfe3d35363e22cab 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -227,10 +227,10 @@ pair<Buffer::LogType, string> const Buffer::getLogName() const
 
        if (b_fi.exist() &&
            (!f_fi.exist() || f_fi.getModificationTime() < b_fi.getModificationTime())) {
-               lyxerr[Debug::FILES] << "Log name calculated as : " << bname << endl;
+               lyxerr[Debug::FILES] << "Log name calculated as: " << bname << endl;
                return make_pair(Buffer::buildlog, bname);
        }
-       lyxerr[Debug::FILES] << "Log name calculated as : " << fname << endl;
+       lyxerr[Debug::FILES] << "Log name calculated as: " << fname << endl;
        return make_pair(Buffer::latexlog, fname);
 }
 
@@ -2140,7 +2140,7 @@ void Buffer::makeLaTeXFile(ostream & os,
        // Just to be sure. (Asger)
        texrow.newline();
 
-       lyxerr[Debug::INFO] << "Finished making latex file." << endl;
+       lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl;
        lyxerr[Debug::INFO] << "Row count was " << texrow.rows() - 1
                            << '.' << endl;
 
@@ -2328,8 +2328,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                case LATEX_COMMAND:
                        if (depth!= 0)
                                sgmlError(par, 0,
-                                         _("Error : Wrong depth for"
-                                           " LatexType Command.\n"));
+                                         _("Error: Wrong depth for LatexType Command.\n"));
 
                        if (!environment_stack[depth].empty()) {
                                sgml::closeTag(ofs, depth, false, environment_stack[depth]);
@@ -2802,8 +2801,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                case LATEX_COMMAND:
                        if (depth != 0)
                                sgmlError(par, 0,
-                                         _("Error : Wrong depth for "
-                                           "LatexType Command.\n"));
+                                         _("Error: Wrong depth for LatexType Command.\n"));
 
                        command_name = style->latexname();
 

diff --git a/src/exporter.C b/src/exporter.C
index 49a66b2f716b2689ab55b656e09e9e899aaa05db..08a857ff68010409a5a5c97ff44e19a708e0d199 100644 (file)
--- a/src/exporter.C
+++ b/src/exporter.C
@@ -86,7 +86,7 @@ bool Exporter::Export(Buffer * buffer, string const & format,
        else if (backend_format == format)
                buffer->makeLaTeXFile(filename, string(), true);
        else if (contains(buffer->filePath(), ' ')) {
-               Alert::alert(_("Cannot run latex."),
+               Alert::alert(_("Cannot run LaTeX."),
                           _("The path to the lyx file cannot contain spaces."));
                return false;
        } else

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 286fb180d5c6fdfd6c9e3fea0813cbb6ed31a621..0d2480c7f30ed33fa8789a3ba73e95362210a4a9 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,12 @@
+2003-01-06  Michael Schmitt <Michael.Schmitt@teststep.org>
+
+       * FileDialog.C:
+       * QIndexDialog.C:
+       * QPrefsDialog.C:
+       * QToc.C:
+       * qfont_loader.C: fix inconsistent usage of spaces, colons,
+       capitalization, and the like.
+
 2003-01-05  John Levon  <levon@movementarian.org>
 
        * QLyXKeySym.h:

diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C
index fc53055d5c9c1161dd283ea410778686e0bb0b68..28a5342392e0753ae27672f9192bb6fa572ced66 100644 (file)
--- a/src/frontends/qt2/FileDialog.C
+++ b/src/frontends/qt2/FileDialog.C
@@ -71,7 +71,7 @@ FileDialog::Result const FileDialog::save(string const & path,
                dlg.setSelection(toqstr(suggested));
 
        FileDialog::Result result;
-       lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl;
+       lyxerr[Debug::GUI] << "Synchronous FileDialog: " << endl;
        result.first = FileDialog::Chosen;
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;
@@ -99,7 +99,7 @@ FileDialog::Result const FileDialog::open(string const & path,
                dlg.setSelection(toqstr(suggested));
 
        FileDialog::Result result;
-       lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl;
+       lyxerr[Debug::GUI] << "Synchronous FileDialog: " << endl;
        result.first = FileDialog::Chosen;
        int res = dlg.exec();
        lyxerr[Debug::GUI] << "result " << res << endl;

diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt2/QIndexDialog.C
index 308f58bf04e48cd05ca8b5e7c00a0689f41c39d0..5527a2cd9e25d5716a99a48f822919a592ab1313 100644 (file)
--- a/src/frontends/qt2/QIndexDialog.C
+++ b/src/frontends/qt2/QIndexDialog.C
@@ -37,11 +37,11 @@ QIndexDialog::QIndexDialog(QIndex * form)
 "The format of the entry in the index.\n"
 "\n"
 "An entry can be specified as a sub-entry of\n"
-"another with \"!\" :\n"
+"another with \"!\":\n"
 "\n"
 "cars!mileage\n"
 "\n"
-"You can cross-refer to another entry like so :\n"
+"You can cross-refer to another entry like so:\n"
 "\n"
 "cars!mileage|see{economy}\n"
 "\n"

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index 6c8412af765a970da1e9820b83feff4eb6a2fe30..25f1058c754685b9f8b19d6dd4597c783a682e27 100644 (file)
--- a/src/frontends/qt2/QPrefsDialog.C
+++ b/src/frontends/qt2/QPrefsDialog.C
@@ -139,7 +139,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form)
 
        // output
 
-       i = new QListViewItem(out, qt_("Ascii"));
+       i = new QListViewItem(out, qt_("ASCII"));
        pane_map_[i] = asciiModule;
        i = new QListViewItem(out, i, qt_("Date format"));
        pane_map_[i] = dateModule;

diff --git a/src/frontends/qt2/QToc.C b/src/frontends/qt2/QToc.C
index 63b1960cb6a3c0317472313757041f13b16ebb84..49b887efff48d6bf50bc5c8f1fda586f6115171c 100644 (file)
--- a/src/frontends/qt2/QToc.C
+++ b/src/frontends/qt2/QToc.C
@@ -171,7 +171,7 @@ void QToc::select(string const & text)
        }
 
        if (iter == toclist.end()) {
-               lyxerr[Debug::GUI] << "Couldn't find highlighted TOC entry : "
+               lyxerr[Debug::GUI] << "Couldn't find highlighted TOC entry: "
                        << text << endl;
                return;
        }

diff --git a/src/frontends/qt2/qfont_loader.C b/src/frontends/qt2/qfont_loader.C
index e0395b8f9d71fbe7fa0f002730c5b8dbd1bba50d..eb2f28d310a1842228555461204615b48aa32c8f 100644 (file)
--- a/src/frontends/qt2/qfont_loader.C
+++ b/src/frontends/qt2/qfont_loader.C
@@ -168,7 +168,7 @@ QFont const getSymbolFont(string const & family)
                return font;
        }
 
-       lyxerr[Debug::FONT] << " FAILED :(" << endl;
+       lyxerr[Debug::FONT] << " FAILED :-(" << endl;
        return font;
 }
 

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 544987f7145a09a8e1122216674bfaa04646d1d4..ec08b08adb8590d093ed6d0e335a85f9039c42ba 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,22 @@
+2003-01-06  Michael Schmitt <Michael.Schmitt@teststep.org>
+
+       * FormGraphics.C:
+       * xformsImage.C:
+       * forms/form_bibtex.fd:
+       * forms/form_citation.fd:
+       * forms/form_document.fd:
+       * forms/form_search.fd: fix inconsistent usage of spaces, colons,
+       capitalization, and the like.
+
+2002-12-20  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
+
+       * FormTabular.C: fix bug 572, fix ReadOnly logic.
+
+2003-01-06  Angus Leeming  <leeming@lyx.org>
+
+       * forms/fdfixc.sed: Turn off choice titles as they can contain
+       meta-chars that just look nasty.
+
 2003-01-05  John Levon  <levon@movementarian.org>
 
        * XLyXKeySym.h:

diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C
index 80c03d7712497b11445fe01b2b651b76bd348ac5..a52bb4d7847a14c7acfd69413b2542777e15d4f8 100644 (file)
--- a/src/frontends/xforms/FormGraphics.C
+++ b/src/frontends/xforms/FormGraphics.C
@@ -256,7 +256,7 @@ void FormGraphics::build()
        tooltips().init(extra_->check_subcaption, str);
        str = _("Insert the optional subfigure caption.");
        tooltips().init(extra_->input_subcaption, str);
-       str = _("Add any additional latex option, which is defined in the "
+       str = _("Add any additional LaTeX option, which is defined in the "
                "graphicx-package and not mentioned in the gui's tabfolders.");
        tooltips().init(extra_->input_special, str);
 

diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index 483e9c2ee374f40c86853b0be04278f994e67513..c60b7d2850ad69d30b971b585db4a57627439753 100644 (file)
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -188,12 +188,16 @@ void FormTabular::update()
                }
                pwidth = tabular->GetMColumnPWidth(cell);
                align = tabular->GetAlignment(cell);
-               if (align == LYX_ALIGN_LEFT)
-                       fl_set_button(cell_options_->radio_align_left, 1);
-               else if (align == LYX_ALIGN_RIGHT)
+               // set the horiz. alignment, default is left here
+               fl_set_button(column_options_->radio_align_left, 0);
+               fl_set_button(column_options_->radio_align_right, 0);
+               fl_set_button(column_options_->radio_align_center, 0);
+               if (align == LYX_ALIGN_RIGHT)
                        fl_set_button(cell_options_->radio_align_right, 1);
-               else
+               else if (align == LYX_ALIGN_CENTER)
                        fl_set_button(cell_options_->radio_align_center, 1);
+               else
+                       fl_set_button(cell_options_->radio_align_left, 1);
 
                align = tabular->GetVAlignment(cell);
                fl_set_button(cell_options_->radio_valign_top, 0);
@@ -214,7 +218,7 @@ void FormTabular::update()
                                        cell_options_->choice_value_mcolumn_width,
                                        pwidth, default_unit);
 
-               if (bc().bp().isReadOnly()) {
+               if (!bc().bp().isReadOnly()) {
                        setEnabled(cell_options_->input_special_multialign, true);
                        setEnabled(cell_options_->input_mcolumn_width, true);
                        setEnabled(cell_options_->choice_value_mcolumn_width, true);

diff --git a/src/frontends/xforms/forms/fdfixc.sed b/src/frontends/xforms/forms/fdfixc.sed
index 49bc0880256fe1b4176c5fd661343cc939dcfada..93b7722862e49845967a0f6f2046ecc1353c2cfd 100644 (file)
--- a/src/frontends/xforms/forms/fdfixc.sed
+++ b/src/frontends/xforms/forms/fdfixc.sed
@@ -74,6 +74,13 @@ s/\( fdui->form\)\(.*bgn_form.*\)/\1\2\
 /bmtable/ s/fl_add_button/fl_add_bmtable/
 
 
+# For all lines containing fl_add_choice,
+# add a line that turns off the title. (These titles can contain meta-chars
+# that just look nasty ;-)
+/fl_add_choice/a\
+       fl_set_choice_notitle(obj, 1);
+
+
 # For all lines containing "fl_" and a string _not_ containing |,
 # replace the string with _(string)
 /fl_/ s/".[^|]*"/_(&)/

diff --git a/src/frontends/xforms/forms/form_bibtex.fd b/src/frontends/xforms/forms/form_bibtex.fd
index 052d468736e9e3320ec2e07a6d7e611112fa45e0..44383a985553447f369a7876e02fdd29e9ca51f4 100644 (file)
--- a/src/frontends/xforms/forms/form_bibtex.fd
+++ b/src/frontends/xforms/forms/form_bibtex.fd
@@ -167,7 +167,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Styles|#y
+label: Styles:|#y
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_North FL_South

diff --git a/src/frontends/xforms/forms/form_citation.fd b/src/frontends/xforms/forms/form_citation.fd
index 34d0860ee616e1cc68f050f713a32db10cf599c6..6e3e6904f755898fb9cd5d57cb299fbb64e6bd9c 100644 (file)
--- a/src/frontends/xforms/forms/form_citation.fd
+++ b/src/frontends/xforms/forms/form_citation.fd
@@ -41,7 +41,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Inset keys|#I
+label: Inset keys:|#I
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NorthWest FL_South
@@ -59,7 +59,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bibliography keys|#k
+label: Bibliography keys:|#k
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_North FL_SouthEast
@@ -77,7 +77,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Info
+label: Info:
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthWest FL_SouthEast

diff --git a/src/frontends/xforms/forms/form_document.fd b/src/frontends/xforms/forms/form_document.fd
index 7802f4273b61ef0bf8aa3b04a19153f800caaefa..2950b54e3b70ecb8cab66af87494e97b02c998c4 100644 (file)
--- a/src/frontends/xforms/forms/form_document.fd
+++ b/src/frontends/xforms/forms/form_document.fd
@@ -863,7 +863,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Spacing|#g
+label: Spacing:|#g
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1398,7 +1398,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Section number depth
+label: Section number depth:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1420,7 +1420,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Table of contents depth
+label: Table of contents depth:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1442,7 +1442,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: PS Driver|#S
+label: PS Driver:|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1496,7 +1496,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Citation style|#i
+label: Citation style:|#i
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_search.fd b/src/frontends/xforms/forms/form_search.fd
index 16b26d622cd0a8b177d6531dd090432fa9ee6aee..cd81e0762433b8c3c016ba805a32ecc7109c2e74 100644 (file)
--- a/src/frontends/xforms/forms/form_search.fd
+++ b/src/frontends/xforms/forms/form_search.fd
@@ -41,7 +41,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Find|#F
+label: Find:|#F
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East
@@ -59,7 +59,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Replace with|#w
+label: Replace with:|#w
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East

diff --git a/src/frontends/xforms/xformsImage.C b/src/frontends/xforms/xformsImage.C
index 959ff306f2c9a2fd607b9a6cc14da66af47f6c5c..2917f5c9c4b0868a7b78d6d5594c2692e9aa11bb 100644 (file)
--- a/src/frontends/xforms/xformsImage.C
+++ b/src/frontends/xforms/xformsImage.C
@@ -382,7 +382,7 @@ int status_report(FL_IMAGE * ob, const char *s)
                return 0;
 
        lyxerr[Debug::GRAPHICS]
-               << "xforms image loader. Status : " << str << std::endl;
+               << "xforms image loader. Status: " << str << std::endl;
 
        grfx::xformsImage * ptr =
                static_cast<grfx::xformsImage *>(ob->u_vdata);
@@ -401,7 +401,7 @@ static void error_report(FL_IMAGE * ob, const char *s)
                return;
 
        lyxerr[Debug::GRAPHICS]
-               << "xforms image loader. Error : " << str << std::endl;
+               << "xforms image loader. Error: " << str << std::endl;
 
        grfx::xformsImage * ptr =
                static_cast<grfx::xformsImage *>(ob->u_vdata);

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index bba54dfa728f10e7511710a37d386b3025e47293..188b55b163be94c6e27645606b8901ccf32a6959 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-06  Michael Schmitt <Michael.Schmitt@teststep.org>
+
+       * insettext.C: fix inconsistent usage of spaces, colons, capitalization,
+       and the like.
+
 2002-12-18  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 
        * insetgraphics.C (prepareFile): do not remove the extension of

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index e24e992051a4137bbda81690911caa01a45287d2..f42a017ae510a21f490d70894654f6371cd16257 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -1666,7 +1666,7 @@ int InsetText::docbook(Buffer const * buf, ostream & os, bool mixcont) const
                        break;
 
                case LATEX_COMMAND:
-                       buf->sgmlError(p, 0,  _("Error : LatexType Command not allowed here.\n"));
+                       buf->sgmlError(p, 0,  _("Error: LatexType Command not allowed here.\n"));
                        return -1;
                        break;
 

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index a1b316d092db1365152c35f5bc238c33e02f9a6f..1e55b9f504b93daebe18cc8058d4f673f2096e76 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1712,7 +1712,7 @@ void LyXFunc::open(string const & fname)
        if (!f.exist()) {
                if (!Alert::askQuestion(_("No such file"), disp_fn,
                        _("Start a new document with this filename ?"))) {
-                       owner->message(_("Canceled"));
+                       owner->message(_("Canceled."));
                        return;
                }
                // the user specifically chose this name. Believe them.
@@ -1837,7 +1837,7 @@ void LyXFunc::doImport(string const & argument)
        if (FileInfo(lyxfile, true).exist() && filename != lyxfile) {
                if (!Alert::askQuestion(_("A document by the name"),
                        MakeDisplayPath(lyxfile), _("already exists. Overwrite?"))) {
-                       owner->message(_("Canceled"));
+                       owner->message(_("Canceled."));
                        return;
                }
        }

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 7cc8beb20058f4334ac5a703eafba76a194e3553..cce5296d303056e582e6897e10915e0511aafe7a 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -779,7 +779,7 @@ int LyXRC::read(string const & filename)
                        if (lexrc.next()) {
                                x11_name = lexrc.getString();
                        } else {
-                               lexrc.printError("Missing color name for color : `$$Token'");
+                               lexrc.printError("Missing color name for color: `$$Token'");
                                break;
                        }
 
@@ -2083,7 +2083,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_LANGUAGE_PACKAGE:
-               str = _("The latex command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
+               str = _("The LaTeX command for loading the language package. E.g. \"\\usepackage{babel}\", \"\\usepackage{omega}\".");
                break;
 
        case RC_LANGUAGE_GLOBAL_OPTIONS:
@@ -2103,15 +2103,15 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
 
        case RC_LANGUAGE_COMMAND_BEGIN:
-               str = _("The latex command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
+               str = _("The LaTeX command for changing from the language of the document to another language. E.g. \\selectlanguage{$$lang} where $$lang is substituted by the name of the second language.");
                break;
 
        case RC_LANGUAGE_COMMAND_END:
-               str = _("The latex command for changing back to the language of the document.");
+               str = _("The LaTeX command for changing back to the language of the document.");
                break;
 
        case RC_LANGUAGE_COMMAND_LOCAL:
-               str = _("The latex command for local changing of the language.");
+               str = _("The LaTeX command for local changing of the language.");
                break;
 
        case RC_DATE_INSERT_FORMAT: