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

diff --git a/development/ChangeLog b/development/ChangeLog
index add20faf87a507d88f5368914b356861532e5b17..8150bd05bec224a6fda4cac3b29e16b5ce39d35d 100644 (file)
--- a/development/ChangeLog
+++ b/development/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-20  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * Win32/fakeconfig/lyxrc.defaults: rename "ASCII"
+       to "Plain text"
+
 2005-02-03  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * FORMAT: document change to format 241.

diff --git a/development/Win32/fakeconfig/lyxrc.defaults b/development/Win32/fakeconfig/lyxrc.defaults
index 392cf11ade75a4d25565c68940a432371355e677..60d0de4974e3bb0825fa9fac4eba947fe2007eeb 100644 (file)
--- 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 a0d61e598068828f4fd49164fb23cc5a1c385f90..1fb880956bd4045b4239adf336f7b511ae51b4db 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-20  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * configure.m4: rename "ASCII" to "Plain text"
+
 2005-05-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * layouts/report.layout: no need to change LabelString here

diff --git a/lib/configure.m4 b/lib/configure.m4
index 0aea284b018c2e7b898b230286d9a78ecf344fa9..9bfbaa61370db05ef2d74dd0efcbf8434af6c78f 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -580,9 +580,9 @@ cat >$outfile <<EOF
 # 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)"  "" ""       "$TEXT_EDITOR"
-\\Format asciiimage asc    "ASCII (image)"         "" ""       "$TEXT_EDITOR"
-\\Format asciixfig  asc    "ASCII (xfig output)"   "" ""       "$TEXT_EDITOR"
+\\Format asciichess asc    "Plain text (chess output)"  "" ""  "$TEXT_EDITOR"
+\\Format asciiimage asc    "Plain text (image)"         "" ""  "$TEXT_EDITOR"
+\\Format asciixfig  asc    "Plain text (xfig output)"   "" ""  "$TEXT_EDITOR"
 \\Format agr        agr     GRACE                  "" "$GRACE_VIEWER"  "$GRACE_EDITOR"
 \\Format bmp        bmp     BMP                    "" "$RASTERIMAGE_VIEWER"    "$RASTERIMAGE_EDITOR"
 \\Format date       ""     "date command"          "" ""       ""
@@ -615,8 +615,8 @@ cat >$outfile <<EOF
 \\Format pstex      pstex_t PSTEX                  "" ""       ""
 \\Format tgif       obj     TGIF                   "" "$TGIF_VIEWER"   "$TGIF_EDITOR"
 \\Format sxw        sxw    "OpenOffice.Org Writer" O  ""       ""
-\\Format text       txt     ASCII                  A  ""       "$TEXT_EDITOR"
-\\Format textparagraph txt "ASCII (paragraphs)"    "" ""       "$TEXT_EDITOR"
+\\Format text       txt    "Plain text"            A  ""       "$TEXT_EDITOR"
+\\Format textparagraph txt "Plain text (paragraphs)"    "" ""  "$TEXT_EDITOR"
 \\Format tiff       tif     TIFF                   "" "$RASTERIMAGE_VIEWER"    "$RASTERIMAGE_EDITOR"
 \\Format word       doc     Word                   W  ""       ""
 \\Format xbm        xbm     XBM                    "" "$RASTERIMAGE_VIEWER"    "$RASTERIMAGE_EDITOR"

diff --git a/src/ChangeLog b/src/ChangeLog
index 146cdd750050c3c02583e79ffe6021d94c8fbe7f..bdf732835b55432d1e5e8a89277431a678088d3d 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-20  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * MenuBackend.C:
+       * lyxrc.C: rename "ASCII" to "Plain Text"
+
 2005-05-18  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * buffer_funcs.C (expandLabel): take a Buffer as argument;

diff --git a/src/MenuBackend.C b/src/MenuBackend.C
index a96b1ec17baaf7b19e7ad80f805bd8730c23c68e..277b3ea08ed990a3ba5b8f3f45f0acc48fb89d8e 100644 (file)
--- 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 0f57853c8db23aa02e1bfd8cfa9d53733d348ed9..912aec369a6685f4023375de05e16b2ab22147c6 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-20  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * QPrefsDialog.C:
+       * ui/QPrefAsciiModule.ui: rename "ASCII" to "Plain text"
+
 2005-06-21  Jürgen Spitzmüller  <j.spitzmueller@gmx.de>
 
        * QCitationDialog.C: explicitely setCurrentItem on search

diff --git a/src/frontends/qt2/QPrefsDialog.C b/src/frontends/qt2/QPrefsDialog.C
index 695590e86ecced34c5aea0cc8e4e903b54c45544..11b1956f49323f6b259e1e66c806152ba2423d63 100644 (file)
--- 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 db0c2a1782eef0565415d70a0b82b36d70a96e35..f294412a710561759f6da9251fd01e89f4b59b57 100644 (file)
--- a/src/frontends/qt2/ui/QPrefAsciiModule.ui
+++ b/src/frontends/qt2/ui/QPrefAsciiModule.ui
@@ -87,7 +87,7 @@
                             </property>
                             <property>
                                 <name>toolTip</name>
-                                <string>Max. line length of exported ASCII/LaTeX/ SGML files</string>
+                                <string>Max. line length of exported plain text/LaTeX/SGML files</string>
                             </property>
                         </widget>
                         <spacer>
@@ -136,7 +136,7 @@
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>External app for formating tables in ASCII output</string>
+                        <string>External app for formating tables in plain text output</string>
                     </property>
                 </widget>
             </grid>

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index e4eb1b2842c9fbb06757cabac52b2d8bdc7e26ce..3e4bc7ce07804c1c5e7e18624537703aa37bb51c 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,7 @@
+2005-05-20  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * forms/form_preferences.fd: rename "ASCII" to "Plain text"
+
 2005-05-12  Michael Schmitt  <michael.schmitt@teststep.org>
 
        * 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 6b73f77c749813c10f15f7a8f481f7cc0ef74d19..1452018456666524f27af01c673661286720e99d 100644 (file)
--- 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 c6423281daf1d1700af9cadf50e092c17bafdf2c..929fd776c5c5c2f77aad03f73abc34a2721e6f47 100644 (file)
--- 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: