From 5ecd210835895bcbd0571975125213bc02d4ee76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lars=20Gullik=20Bj=C3=B8nnes?= <larsbj@gullik.org>
Date: Wed, 29 Nov 2000 15:34:56 +0000
Subject: [PATCH] patch from Levon

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1246 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog    | 12 ++++++++++++
 src/LColor.C |  2 +-
 src/buffer.C |  5 ++++-
 src/lyxrc.C  | 26 +++++++++++++++++++++++++-
 4 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71873d1a59..5c4a4a15db 100644
--- 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 31a23f0d0e..a7c7c89f94 100644
--- 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 b1442f99c9..96eb02eb4e 100644
--- 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 2fcdd26baf..4477a06319 100644
--- 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: