From: Michael Schmitt Date: Sun, 17 Jul 2005 12:39:56 +0000 (+0000) Subject: Various text message changes X-Git-Tag: 1.6.10~14063 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f6b917140d0d6be2bb0b74c137509db622aaa749;p=lyx.git 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 f2069cc936..ac030b3dc0 100644 --- 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 3b2116afd1..e7a4e68a4d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2005-07-17 Michael Schmitt + + * debug.C: fix typo + * buffer.C: clarify message + 2005-07-17 Lars Gullik Bjønnes * dociterator.C (DocIterator): fix initialization order diff --git a/src/buffer.C b/src/buffer.C index 6200281c9d..83050e6558 100644 --- 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 7322122a8a..a85cabe792 100644 --- a/src/client/ChangeLog +++ b/src/client/ChangeLog @@ -1,3 +1,7 @@ +2005-07-17 Michael Schmitt + + * debug.C: fix typo + 2005-04-25 Angus Leeming * client.C: diff --git a/src/client/debug.C b/src/client/debug.C index bcc16194d4..f3bb53532e 100644 --- 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 75852f61d9..24977bc1b8 100644 --- 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 ef3a75a455..87c15c0d39 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2005-07-17 Michael Schmitt + + * ui/QBibtexDialogBase.ui: fix typo + * ui/QChangesDialogBase.ui: remove space from message + 2005-07-18 José Matos * 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 80a030c40f..a91335fdc4 100644 --- a/src/frontends/qt2/ui/QBibtexDialogBase.ui +++ b/src/frontends/qt2/ui/QBibtexDialogBase.ui @@ -251,7 +251,7 @@ toolTip - Chose a style file + Choose a style file diff --git a/src/frontends/qt2/ui/QChangesDialogBase.ui b/src/frontends/qt2/ui/QChangesDialogBase.ui index 8dac74fb4f..8b88bb2fb2 100644 --- a/src/frontends/qt2/ui/QChangesDialogBase.ui +++ b/src/frontends/qt2/ui/QChangesDialogBase.ui @@ -57,7 +57,7 @@ text - Change : + Change: diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index badc8d1a99..d18ab9634a 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,11 @@ +2005-07-17 Michael Schmitt + + * 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 * 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 86392b89b4..140af1d421 100644 --- 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 d3535b4464..d0eda85cc9 100644 --- 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 \""); + str = _("Optional text which appears before the citation, e.g. \"see \""); 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 8fa27dfdbe..8bced96a7c 100644 --- 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 1452018456..21c573d761 100644 --- 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 8aa2c42ef9..4729678c0c 100644 --- 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."),