From c776e0754af608677c1e897f066da55ca22aae8a Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=BCrgen=20Spitzm=C3=BCller?= Date: Sat, 21 May 2005 13:26:13 +0000 Subject: [PATCH] Michael's "ASCII->Plain Text" changes (bug 1572) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9965 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/ChangeLog | 5 +++++ development/Win32/fakeconfig/lyxrc.defaults | 6 +++--- lib/ChangeLog | 4 ++++ lib/configure.m4 | 10 +++++----- src/ChangeLog | 5 +++++ src/MenuBackend.C | 4 ++-- src/frontends/qt2/ChangeLog | 5 +++++ src/frontends/qt2/QPrefsDialog.C | 2 +- src/frontends/qt2/ui/QPrefAsciiModule.ui | 4 ++-- src/frontends/xforms/ChangeLog | 4 ++++ src/frontends/xforms/forms/form_preferences.fd | 4 ++-- src/lyxrc.C | 4 ++-- 12 files changed, 40 insertions(+), 17 deletions(-) diff --git a/development/ChangeLog b/development/ChangeLog index add20faf87..8150bd05be 100644 --- a/development/ChangeLog +++ b/development/ChangeLog @@ -1,3 +1,8 @@ +2005-05-20 Michael Schmitt + + * Win32/fakeconfig/lyxrc.defaults: rename "ASCII" + to "Plain text" + 2005-02-03 Georg Baum * FORMAT: document change to format 241. diff --git a/development/Win32/fakeconfig/lyxrc.defaults b/development/Win32/fakeconfig/lyxrc.defaults index 392cf11ade..60d0de4974 100644 --- a/development/Win32/fakeconfig/lyxrc.defaults +++ b/development/Win32/fakeconfig/lyxrc.defaults @@ -4,9 +4,9 @@ # want to customize LyX, make a copy of the file LYXDIR/lyxrc as # ~/.lyx/lyxrc and edit this file instead. Any setting in lyxrc will # override the values given here. -\Format asciichess asc "ASCII (chess output)" "" "" "kedit" -\Format asciiimage asc "ASCII (image)" "" "" "kedit" -\Format asciixfig asc "ASCII (xfig output)" "" "" "kedit" +\Format asciichess asc "Plain text (chess output)" "" "" "kedit" +\Format asciiimage asc "Plain text (image)" "" "" "kedit" +\Format asciixfig asc "Plain text (xfig output)" "" "" "kedit" \Format agr agr GRACE "" "none" "none" \Format bmp bmp BMP "" "kview" "gimp" \Format date "" "date command" "" "" "" diff --git a/lib/ChangeLog b/lib/ChangeLog index a0d61e5980..1fb880956b 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2005-05-20 Michael Schmitt + + * configure.m4: rename "ASCII" to "Plain text" + 2005-05-18 Jean-Marc Lasgouttes * layouts/report.layout: no need to change LabelString here diff --git a/lib/configure.m4 b/lib/configure.m4 index 0aea284b01..9bfbaa6137 100644 --- a/lib/configure.m4 +++ b/lib/configure.m4 @@ -580,9 +580,9 @@ cat >$outfile <$outfile < + + * MenuBackend.C: + * lyxrc.C: rename "ASCII" to "Plain Text" + 2005-05-18 Jean-Marc Lasgouttes * buffer_funcs.C (expandLabel): take a Buffer as argument; diff --git a/src/MenuBackend.C b/src/MenuBackend.C index a96b1ec17b..277b3ea08e 100644 --- a/src/MenuBackend.C +++ b/src/MenuBackend.C @@ -513,9 +513,9 @@ void expandFormats(MenuItem::Kind kind, Menu & tomenu, LyXView const * view) if (kind == MenuItem::ImportFormats) { if ((*fit)->name() == "text") - label = _("ASCII text as lines"); + label = _("Plain Text as Lines"); else if ((*fit)->name() == "textparagraph") - label = _("ASCII text as paragraphs"); + label = _("Plain Text as Paragraphs"); label += "..."; } if (!(*fit)->shortcut().empty()) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 0f57853c8d..912aec369a 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,8 @@ +2005-06-20 Michael Schmitt + + * QPrefsDialog.C: + * ui/QPrefAsciiModule.ui: rename "ASCII" to "Plain text" + 2005-06-21 Jürgen Spitzmüller * QCitationDialog.C: explicitely setCurrentItem on search diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C index 695590e86e..11b1956f49 100644 --- a/src/frontends/qt2/QPrefsDialog.C +++ b/src/frontends/qt2/QPrefsDialog.C @@ -106,7 +106,7 @@ QPrefsDialog::QPrefsDialog(QPrefs * form) string const op = _("Outputs"); prefsPS->addCategory(op); - prefsPS->addPanel(asciiModule, _("ASCII"), op); + prefsPS->addPanel(asciiModule, _("Plain text"), op); prefsPS->addPanel(dateModule, _("Date format"), op); prefsPS->addPanel(latexModule, _("LaTeX"), op); #if defined(__CYGWIN__) || defined(__CYGWIN32__) diff --git a/src/frontends/qt2/ui/QPrefAsciiModule.ui b/src/frontends/qt2/ui/QPrefAsciiModule.ui index db0c2a1782..f294412a71 100644 --- a/src/frontends/qt2/ui/QPrefAsciiModule.ui +++ b/src/frontends/qt2/ui/QPrefAsciiModule.ui @@ -87,7 +87,7 @@ toolTip - Max. line length of exported ASCII/LaTeX/ SGML files + Max. line length of exported plain text/LaTeX/SGML files @@ -136,7 +136,7 @@ toolTip - External app for formating tables in ASCII output + External app for formating tables in plain text output diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index e4eb1b2842..3e4bc7ce07 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2005-05-20 Michael Schmitt + + * forms/form_preferences.fd: rename "ASCII" to "Plain text" + 2005-05-12 Michael Schmitt * Dialogs.C: change dialog title "Index" => "Index Entry" diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd index 6b73f77c74..1452018456 100644 --- a/src/frontends/xforms/forms/form_preferences.fd +++ b/src/frontends/xforms/forms/form_preferences.fd @@ -2947,7 +2947,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: ASCII line length:|#A +label: Plain text line length:|#A shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity @@ -3023,7 +3023,7 @@ alignment: FL_ALIGN_LEFT style: FL_NORMAL_STYLE size: FL_NORMAL_SIZE lcol: FL_BLACK -label: ASCII roff:|#r +label: Plain text roff:|#r shortcut: resize: FL_RESIZE_ALL gravity: FL_NoGravity FL_NoGravity diff --git a/src/lyxrc.C b/src/lyxrc.C index c6423281da..929fd776c5 100644 --- a/src/lyxrc.C +++ b/src/lyxrc.C @@ -2054,11 +2054,11 @@ string const LyXRC::getDescription(LyXRCTags tag) break; case RC_ASCIIROFF_COMMAND: - str = _("Use to define an external program to render tables in the ASCII output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used."); + str = _("Use to define an external program to render tables in plain text output. E.g. \"groff -t -Tlatin1 $$FName\" where $$FName is the input file. If \"none\" is specified, an internal routine is used."); break; case RC_ASCII_LINELEN: - str = _("This is the maximum line length of an exported ASCII file (LaTeX, SGML or plain text)."); + str = _("This is the maximum line length of an exported text file (LaTeX, SGML or plain text)."); break; case RC_AUTOREGIONDELETE: -- 2.39.5