The attached patch is three little cleanups intended for LyX 1.1.6.
thanks
john
p.s. is there any chance POTFILES.in can get cvs removed ? It is very
galling having to delete it each time from the diff
--
"We signed to play until the day we died, and we did."
- Jimmy Greaves
Index: ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/ChangeLog,v
retrieving revision 1.702
diff -u -p -r1.702 ChangeLog
--- ChangeLog 2000/11/28 16:38:25 1.702
+++ ChangeLog 2000/11/29 15:00:49
@@ -1,3 +1,15 @@
+2000-11-29 John Levon <[EMAIL PROTECTED]>
+
+ * src/lyx_rc.C: more detail for the printer program config
+ dialog.
+
+ * src/LColor.C: ert->latex text. LColor needs a big revamp
+ but will have to wait till after 1.1.6
+
+ * src/buffer.C: bring up a dialog if we load a document
+ with an un-installed text class, rather than just complain
+ on the console.
+
2000-11-28 Lars Gullik Bjønnes <[EMAIL PROTECTED]>
* configure.in: fix typo
Index: src/LColor.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LColor.C,v
retrieving revision 1.16
diff -u -p -r1.16 LColor.C
--- src/LColor.C 2000/11/21 21:51:24 1.16
+++ src/LColor.C 2000/11/29 15:00:50
@@ -85,7 +85,7 @@ LColor::LColor()
{ footnote, N_("footnote"), "footnote", "DarkRed", "footnote" },
{ footnotebg, N_("footnote background"), "footnotebg", "grey60", "footnotebg"
},
{ footnoteframe, N_("footnote frame"), "footnoteframe", "IndianRed",
"footnoteframe" },
- { ert, N_("ert"), "ert", "DarkRed", "ert" },
+ { ert, N_("latex text"), "ert", "DarkRed", "ert" },
{ inset, N_("inset"), "inset", "black", "inset" },
{ insetbg, N_("inset background"), "insetbg", "grey60", "insetbg" },
{ insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.157
diff -u -p -r1.157 buffer.C
--- src/buffer.C 2000/11/21 22:16:14 1.157
+++ src/buffer.C 2000/11/29 15:00:51
@@ -485,7 +485,10 @@ Buffer::parseSingleLyXformat2Token(LyXLe
if (pp.first) {
params.textclass = pp.second;
} else {
- lex.printError("Unknown textclass `$$Token'");
+ WriteAlert(string(_("Textclass error")),
+ string(_("The document uses an unknown textclass \""))
++
+ lex.GetString() + string("\"."),
+ string(_("LyX will not be able to produce output
+correctly.")));
params.textclass = 0;
}
if (!textclasslist.Load(params.textclass)) {
Index: src/lyxrc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxrc.C,v
retrieving revision 1.73
diff -u -p -r1.73 lyxrc.C
--- src/lyxrc.C 2000/11/21 21:51:24 1.73
+++ src/lyxrc.C 2000/11/29 15:00:52
@@ -1595,15 +1595,39 @@ string const LyXRC::getDescription(LyXRC
break;
case RC_PRINTEVENPAGEFLAG:
+ str = N_("The option to print only even pages.");
+ break;
+
case RC_PRINTODDPAGEFLAG:
+ str = N_("The option to print only odd pages.");
+ break;
+
case RC_PRINTPAGERANGEFLAG:
+ str = N_("The option for specifying a comma-separated list of pages to
+print.");
+ break;
+
case RC_PRINTCOPIESFLAG:
+ str = N_("The option for specifying the number of copies to print.");
+ break;
+
case RC_PRINTCOLLCOPIESFLAG:
+ str = N_("The option for specifying whether the copies should be
+collated.");
+ break;
+
case RC_PRINTREVERSEFLAG:
+ str = N_("The option to reverse the order of the pages printed.");
+ break;
+
case RC_PRINTLANDSCAPEFLAG:
+ str = N_("The option to print out in landscape.");
+ break;
+
case RC_PRINTPAPERFLAG:
+ str = N_("The option to specify paper type.");
+ break;
+
case RC_PRINTPAPERDIMENSIONFLAG:
- str = N_("Look at the man page for your favorite print program to
learn which options to use.");
+ str = N_("Option to specify the dimensions of the print paper.");
break;
case RC_PRINTTOPRINTER:
