From eba67bc3120dc301bf193c3f3b570f51f00a4654 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Fri, 29 Dec 2000 15:23:01 +0000 Subject: [PATCH] Swap two printer related help messages. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1290 a592a061-630c-0410-9148-cb99ea01b6c8 --- ChangeLog | 8 ++++++-- po/POTFILES.in | 28 +++++++++++++------------- src/frontends/xforms/FormPreferences.C | 4 ++-- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index e145fbf3f1..5944dc1b80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-12-29 Jean-Marc Lasgouttes + + * src/frontends/xforms/FormPreferences.C (feedback): fix + description of RC_PRINTCOPIESFLAG and RC_PRINTCOLLCOPIESFLAG. + 2000-12-29 Lars Gullik Bjønnes * src/support/FileInfo.h: move unistd.h to after sys/types.h and @@ -13,7 +18,6 @@ * src/frontends/xforms/xform_helpers.C: adjust the order of includes, some whitespace changes. - * src/trans.C (Load): constify filename and res @@ -42,7 +46,7 @@ (scroll_cb): emit signal * src/LaTeXFeatures.C: include Floatlist.h - (getPackages): only load flot.sty when needed + (getPackages): only load float.sty when needed (getMacros): prepare for outputting the correct code to preamble. * src/Floating.h: make all variables private + rename to var_. diff --git a/po/POTFILES.in b/po/POTFILES.in index 6bbe76c923..59c622c560 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -53,35 +53,35 @@ src/frontends/kde/refdlg.C src/frontends/kde/tocdlg.C src/frontends/kde/urldlg.C src/frontends/xforms/FormBase.h -src/frontends/xforms/form_citation.C src/frontends/xforms/FormCitation.C -src/frontends/xforms/form_copyright.C +src/frontends/xforms/form_citation.C src/frontends/xforms/FormCopyright.C -src/frontends/xforms/form_document.C +src/frontends/xforms/form_copyright.C src/frontends/xforms/FormDocument.C -src/frontends/xforms/form_error.C +src/frontends/xforms/form_document.C src/frontends/xforms/FormError.C -src/frontends/xforms/form_graphics.C +src/frontends/xforms/form_error.C src/frontends/xforms/FormGraphics.C -src/frontends/xforms/form_index.C +src/frontends/xforms/form_graphics.C src/frontends/xforms/FormIndex.C +src/frontends/xforms/form_index.C src/frontends/xforms/FormInset.h -src/frontends/xforms/form_paragraph.C src/frontends/xforms/FormParagraph.C -src/frontends/xforms/form_preferences.C +src/frontends/xforms/form_paragraph.C src/frontends/xforms/FormPreferences.C -src/frontends/xforms/form_print.C +src/frontends/xforms/form_preferences.C src/frontends/xforms/FormPrint.C -src/frontends/xforms/form_ref.C +src/frontends/xforms/form_print.C src/frontends/xforms/FormRef.C -src/frontends/xforms/form_tabular.C +src/frontends/xforms/form_ref.C src/frontends/xforms/FormTabular.C -src/frontends/xforms/form_tabular_create.C +src/frontends/xforms/form_tabular.C src/frontends/xforms/FormTabularCreate.C -src/frontends/xforms/form_toc.C +src/frontends/xforms/form_tabular_create.C src/frontends/xforms/FormToc.C -src/frontends/xforms/form_url.C +src/frontends/xforms/form_toc.C src/frontends/xforms/FormUrl.C +src/frontends/xforms/form_url.C src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C src/frontends/xforms/xform_helpers.C diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C index ea3ca55686..c3273f57fa 100644 --- a/src/frontends/xforms/FormPreferences.C +++ b/src/frontends/xforms/FormPreferences.C @@ -2369,9 +2369,9 @@ FormPreferences::Printer::feedback(FL_OBJECT const * const ob) const else if (ob == dialog_->input_landscape) str = lyxrc.getDescription(LyXRC::RC_PRINTLANDSCAPEFLAG); else if (ob == dialog_->input_copies) - str = lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG); - else if (ob == dialog_->input_collated) str = lyxrc.getDescription(LyXRC::RC_PRINTCOPIESFLAG); + else if (ob == dialog_->input_collated) + str = lyxrc.getDescription(LyXRC::RC_PRINTCOLLCOPIESFLAG); else if (ob == dialog_->input_paper_type) str = lyxrc.getDescription(LyXRC::RC_PRINTPAPERFLAG); else if (ob == dialog_->input_paper_size) -- 2.39.2