anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Various text message changes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@10279 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Michael Schmitt 2005-07-17 12:39:56 +00:00
parent b11f5b1708
commit f6b917140d
15 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/layouts/svjour.inc
View File

@ -270,7 +270,7 @@ Style Abstract
End
Style Keywords
Style Keywords
Margin First_Dynamic
LatexType Command
LatexName keywords

5
src/ChangeLog
View File

@ -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

10
src/buffer.C
View File

@ -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

4
src/client/ChangeLog
View File

@ -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:

2
src/client/debug.C
View File

@ -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")}
};

2
src/debug.C
View File

@ -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")}
};

5
src/frontends/qt2/ChangeLog
View File

@ -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,

2
src/frontends/qt2/ui/QBibtexDialogBase.ui
View File

@ -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" >

2
src/frontends/qt2/ui/QChangesDialogBase.ui
View File

@ -57,7 +57,7 @@
</property>
<property stdset="1">
<name>text</name>
<string>Change :</string>
<string>Change:</string>
</property>
</widget>
<widget>

8
src/frontends/xforms/ChangeLog
View File

@ -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,

2
src/frontends/xforms/ColorHandler.C
View File

@ -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(

4
src/frontends/xforms/FormCitation.C
View File

@ -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\"");

8
src/frontends/xforms/FormPreferences.C
View File

@ -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)

4
src/frontends/xforms/forms/form_preferences.fd
View File

@ -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

2
src/lyx_main.C
View File

@ -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."),