patch from Levon

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

diff --git a/ChangeLog b/ChangeLog
index 71873d1a59c0d86339a75d7c7d1e84a605a53b93..5c4a4a15db8dff1931bf6ccacd27ad1d2e487ab2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2000-11-29  John Levon  <moz@compsoc.man.ac.uk>
+
+       * 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-29  Angus Leeming <a.leeming@ic.ac.uk>
 
        * src/combox.[Ch] )(add, Show): workaround xforms bug when Show()ing

diff --git a/src/LColor.C b/src/LColor.C
index 31a23f0d0e3a66d17b4fe7a6e370f822b757d853..a7c7c89f94c1a0ecf9fee6e92e06660480bf4da1 100644 (file)
--- a/src/LColor.C
+++ b/src/LColor.C
@@ -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" },

diff --git a/src/buffer.C b/src/buffer.C
index b1442f99c9d6c09b23e46ceced06df4dc2472843..96eb02eb4ea6e40f3d138628d43731b9753998fa 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -485,7 +485,10 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, LyXParagraph *& par,
                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)) {

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 2fcdd26baf3fff4f9c1bdbecb19bd487ad10dc60..4477a063197f620b1d6bf1a0068f869f7097f20e 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -1595,15 +1595,39 @@ string const LyXRC::getDescription(LyXRCTags tag)
                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: