Various text message changes

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

diff --git a/lib/layouts/svjour.inc b/lib/layouts/svjour.inc
index f2069cc936230ec4dd73659648b6bdce16183612..ac030b3dc00f2d7df38392d18529faf3bfd0176b 100644 (file)
--- a/lib/layouts/svjour.inc
+++ b/lib/layouts/svjour.inc
@@ -270,7 +270,7 @@ Style Abstract
 End
 
 
-Style  Keywords
+Style Keywords
        Margin                First_Dynamic
        LatexType             Command
        LatexName             keywords

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b2116afd1e980eebc303925c261377fdeb8246e..e7a4e68a4d57b9f23288dab78cd0534838d84479 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-17  Michael Schmitt  <michqel.schmitt@teststep.org>
+
+       * debug.C: fix typo
+       * buffer.C: clarify message
+       
 2005-07-17  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * dociterator.C (DocIterator): fix initialization order

diff --git a/src/buffer.C b/src/buffer.C
index 6200281c9dc7e6bec412e5ce96eeda065a6f4acd..83050e655890b249bd63a6b7ea08dccf35937a70 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -431,7 +431,7 @@ int Buffer::readHeader(LyXLex & lex)
                        continue;
                }
 
-               lyxerr[Debug::PARSER] << "Handling header token: `"
+               lyxerr[Debug::PARSER] << "Handling document header token: `"
                                      << token << '\'' << endl;
 
                string unknown = params().readToken(lex, token);
@@ -444,14 +444,14 @@ int Buffer::readHeader(LyXLex & lex)
                                                           "%1$s %2$s\n"),
                                                         token,
                                                         lex.getString());
-                               error(ErrorItem(_("Header error"), s,
+                               error(ErrorItem(_("Document header error"), s,
                                                -1, 0, 0));
                        }
                }
        }
        if (begin_header_line) {
                string const s = _("\\begin_header is missing");
-               error(ErrorItem(_("Header error"), s, -1, 0, 0));
+               error(ErrorItem(_("Document header error"), s, -1, 0, 0));
        }
        return unknown_tokens;
 }
@@ -466,7 +466,7 @@ bool Buffer::readDocument(LyXLex & lex)
        string const token = lex.getString();
        if (token != "\\begin_document") {
                string const s = _("\\begin_document is missing");
-               error(ErrorItem(_("Header error"), s, -1, 0, 0));
+               error(ErrorItem(_("Document header error"), s, -1, 0, 0));
        }
 
        if (paragraphs().empty()) {
@@ -857,7 +857,7 @@ void Buffer::makeLaTeXFile(ostream & os,
                texrow().newline();
                texrow().newline();
        }
-       lyxerr[Debug::INFO] << "lyx header finished" << endl;
+       lyxerr[Debug::INFO] << "lyx document header finished" << endl;
        // There are a few differences between nice LaTeX and usual files:
        // usual is \batchmode and has a
        // special input@path to allow the including of figures

diff --git a/src/client/ChangeLog b/src/client/ChangeLog
index 7322122a8a0e5ef12d3006e4c8900405abcb0024..a85cabe792b570e0fcec5d0832cb6e8f0c3a73e7 100644 (file)
--- a/src/client/ChangeLog
+++ b/src/client/ChangeLog
@@ -1,3 +1,7 @@
+2005-07-17  Michael Schmitt  <michqel.schmitt@teststep.org>
+
+       * debug.C: fix typo
+
 2005-04-25  Angus Leeming  <leeming@lyx.org>
 
        * client.C:

diff --git a/src/client/debug.C b/src/client/debug.C
index bcc16194d44abc071cd453e92f30269f0968cc9a..f3bb53532eceb4f656cf9c9eb2ded439922ace0a 100644 (file)
--- a/src/client/debug.C
+++ b/src/client/debug.C
@@ -40,7 +40,7 @@ struct error_item {
 error_item errorTags[] = {
        { Debug::NONE,      "none",      N_("No debugging message")},
        { Debug::INFO,      "info",      N_("General information")},
-       { Debug::DEBUG,  "debug",  N_("Developers general debug messages")},
+       { Debug::DEBUG,     "debug",     N_("Developers' general debug messages")},
        { Debug::ANY,       "any",       N_("All debugging messages")}
 };
 

diff --git a/src/debug.C b/src/debug.C
index 75852f61d9730fe59f7e900152a419c17fba3930..24977bc1b88a17dfe5eb83a8a822fa603d839345 100644 (file)
--- a/src/debug.C
+++ b/src/debug.C
@@ -63,7 +63,7 @@ error_item errorTags[] = {
        { Debug::GRAPHICS,  "graphics",  N_("Graphics conversion and loading")},
        { Debug::CHANGES,   "changes",   N_("Change tracking")},
        { Debug::EXTERNAL,  "external",  N_("External template/inset messages")},
-       { Debug::DEBUG,  "debug",  N_("Developers general debug messages")},
+       { Debug::DEBUG,     "debug",     N_("Developers' general debug messages")},
        { Debug::ANY,       "any",       N_("All debugging messages")}
 };
 

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index ef3a75a4553bf9223be58ec9e0a584406d23573e..87c15c0d39992e07bba44f33559b9231f3226e21 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-17  Michael Schmitt  <michqel.schmitt@teststep.org>
+
+       * ui/QBibtexDialogBase.ui: fix typo
+       * ui/QChangesDialogBase.ui: remove space from message
+
 2005-07-18  José Matos  <jamatos@fc.up.pt>
 
        * QDocument.C: new file format, remove support for a4.sty,

diff --git a/src/frontends/qt2/ui/QBibtexDialogBase.ui b/src/frontends/qt2/ui/QBibtexDialogBase.ui
index 80a030c40f9f0120838766239534d7370fc2b8f9..a91335fdc4287ff3135745b17c5428c23dc7135a 100644 (file)
--- a/src/frontends/qt2/ui/QBibtexDialogBase.ui
+++ b/src/frontends/qt2/ui/QBibtexDialogBase.ui
@@ -251,7 +251,7 @@
             </property>
             <property>
                 <name>toolTip</name>
-                <string>Chose a style file</string>
+                <string>Choose a style file</string>
             </property>
         </widget>
         <widget row="5"  column="2" >

diff --git a/src/frontends/qt2/ui/QChangesDialogBase.ui b/src/frontends/qt2/ui/QChangesDialogBase.ui
index 8dac74fb4f1da7cf55d9cc4376590044de7e926e..8b88bb2fb20527006c280bcffb8fb45eee4b19ad 100644 (file)
--- a/src/frontends/qt2/ui/QChangesDialogBase.ui
+++ b/src/frontends/qt2/ui/QChangesDialogBase.ui
@@ -57,7 +57,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Change :</string>
+                        <string>Change:</string>
                     </property>
                 </widget>
                 <widget>

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index badc8d1a99460a555b93c3abe0506d2caea6decb..d18ab9634a0a23496d4bb44ea2758c8f17ef1172 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-17  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * ColorHandler.C: fix bformat message
+       * FormCitation.C: Message changes: "Ref" => "Citation"; "Lists" =>
+       "List"
+       * forms/form_preferences.fd: remove spaces from messages
+       * FormPreferences.C: simplify/clarify messages
+       
 2005-07-18  José Matos  <jamatos@fc.up.pt>
 
        * FormDocument.C: new file format, remove support for a4.sty,

diff --git a/src/frontends/xforms/ColorHandler.C b/src/frontends/xforms/ColorHandler.C
index 86392b89b4f1c3b8825d28a42883a7357320247a..140af1d4212b3d30d8bb2d0726e90fb60a8bed5a 100644 (file)
--- a/src/frontends/xforms/ColorHandler.C
+++ b/src/frontends/xforms/ColorHandler.C
@@ -155,7 +155,7 @@ GC LyXColorHandler::getGCForeground(string const & s)
                }
 
                lyxerr << bformat(
-                       _("LyX: Couldn't allocate '%1$s' with (r,g,b)=%3$s.\n"),
+                       _("LyX: Couldn't allocate '%1$s' with (r,g,b)=%2$s.\n"),
                        s, tostr(xcol));
 
                lyxerr << bformat(

diff --git a/src/frontends/xforms/FormCitation.C b/src/frontends/xforms/FormCitation.C
index d3535b44644019c609c30097360654ef452cd90f..d0eda85cc9a96624b4be6a7930e4982ff5433f48 100644 (file)
--- a/src/frontends/xforms/FormCitation.C
+++ b/src/frontends/xforms/FormCitation.C
@@ -191,7 +191,7 @@ void FormCitation::build()
        setPrehandler(dialog_->browser_cite);
 #endif
 
-       str = _("All entries in the database you have loaded (via \"Insert->Lists&TOC->BibTeX Bibliography\"). Move the ones you want to cite with the arrow buttons into the left browser window.");
+       str = _("All entries in the database you have loaded (via \"Insert->List / TOC->BibTeX Bibliography\"). Move the ones you want to cite with the arrow buttons into the left browser window.");
        tooltips().init(dialog_->browser_bib, str);
 #if FL_VERSION == 0 || (FL_REVISION == 0 && FL_FIXLEVEL == 0)
        // Work-around xforms' bug; enable tooltips for browser widgets.
@@ -214,7 +214,7 @@ void FormCitation::build()
        str = _("Activate if you want to print the first character of the author name as uppercase (\"Van Gogh\", not \"van Gogh\"). Useful at the beginning of sentences (Natbib).");
        tooltips().init(dialog_->check_force_uppercase, str);
 
-       str = _("Optional text which appears before the citation, e.g. \"see <Ref>\"");
+       str = _("Optional text which appears before the citation, e.g. \"see <Citation>\"");
        tooltips().init(dialog_->input_before, str);
 
        str = _("Optional text which appears after the citation, e.g. \"pp. 12\"");

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index 8fa27dfdbe6e1b31dc9c08a0ade5dbda7700dca6..8bced96a7ccf9cc65342c02234476a052af29aa1 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -765,11 +765,11 @@ FormPreferences::Converters::feedback(FL_OBJECT const * const ob) const
                return _("The conversion command. $$i is the input file name, "
                         "$$b is the file name without its extension and $$o "
                         "is the name of the output file. $$s can be used "
-                        "as the path to LyX's support directory.");
+                        "as the path to the user/library directory.");
 
        if (ob == dialog_->input_flags)
-               return _("Extra information for the Converter class, whether and "
-                        "how to parse the result, and various other things.");
+               return _("Extra information for the Converter class, e.g., whether and "
+                        "how to parse the result.");
 
        if (ob == dialog_->button_delete)
                return _("Remove the current converter from the list of available "
@@ -1024,7 +1024,7 @@ FormPreferences::Copiers::feedback(FL_OBJECT const * const ob) const
                return _("The command used to copy the file. "
                         "$$i is the \"from\" file name and "
                         "$$o is the \"to\" file name.\n"
-                        "$$s can be used as the path to LyX's support "
+                        "$$s can be used as the path to the user/library "
                         "directory.");
 
        if (ob == dialog_->button_delete)

diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index 1452018456666524f27af01c673661286720e99d..21c573d761ccb960e7911d4d947c16f8b0855084 100644 (file)
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -1051,7 +1051,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Real name : |#R
+label: Real name:|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1069,7 +1069,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Email address : |#E
+label: Email address:|#E
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 8aa2c42ef94285219512934a5fbc32b0914ae091..4729678c0cbf294510b722f2ad761c2aa5ed9648 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -641,7 +641,7 @@ bool LyX::queryUserLyXDir(bool explicit_userdir)
        // to create it. If the user says "no", then exit.
        if (explicit_userdir &&
            Alert::prompt(
-                   _("Missing LyX support directory"),
+                   _("Missing user LyX directory"),
                    bformat(_("You have specified a non-existent user "
                              "LyX directory, %1$s.\n"
                              "It is needed to keep your own configuration."),