Michael's text fixes

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

diff --git a/src/BufferView.C b/src/BufferView.C
index 905a8da34625e6a5c4025737748248a5b1e272df..95c03e8450eb9324ab1c77ffb0acff37f8daf540 100644 (file)
--- a/src/BufferView.C
+++ b/src/BufferView.C
@@ -300,8 +300,7 @@ bool BufferView::insertLyXFile(string const & filen)
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               Alert::alert(_("Error!"),
-                          _("Cannot open specified file: "),
+               Alert::err_alert(_("Error! Cannot open specified file:"),
                           MakeDisplayPath(fname, 50));
                return false;
        }

diff --git a/src/BufferView_pimpl.C b/src/BufferView_pimpl.C
index 6ffe90292132a884f270c4a358b4d381cb1ba8e3..ab27294eca517d1daf0a6210498f8cc2a97f0d30 100644 (file)
--- a/src/BufferView_pimpl.C
+++ b/src/BufferView_pimpl.C
@@ -889,9 +889,9 @@ void BufferView::Pimpl::MenuInsertLyXFile(string const & filen)
 
        ostringstream s1;
 #if USE_BOOST_FORMAT
-       s1 << boost::format(_("Inserting document %1$s ...")) % disp_fn;
+       s1 << boost::format(_("Inserting document %1$s...")) % disp_fn;
 #else
-       s1 << _("Inserting document ") << disp_fn << _(" ...");
+       s1 << _("Inserting document ") << disp_fn << _("...");
 #endif
        owner_->message(STRCONV(s1.str()));
        bool const res = bv_->insertLyXFile(filename);

diff --git a/src/ChangeLog b/src/ChangeLog
index 4543680061fad0bb1fcf778f14a45014ea10ea20..77ed7ce57c2cadbf2d8b5de7e1f2f8d71c242c63 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-20  Michael Schmitt <michael.schmitt@teststep.org>
+
+        * bufferview.C:
+        * lyxcb.C:
+        * lyxfunc.C: Output messages with identical spelling, punctuation,
+        and spaces
+
 2003-01-22  Michael Schmitt  <Michael.Schmitt@teststep.org>
 
        * MenuBackend.C (expandFormats): List only viewable export formats
@@ -7,7 +14,7 @@
        message 
 
        * lyxfunc.C (getStatus): Make sure that formats other than
-       "fax" can be can also be disabled 
+       "fax" can also be disabled 
 
 2003-01-16  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
 

diff --git a/src/buffer.C b/src/buffer.C
index d7d0a456311fb4702de884b42daafe2e253ab43d..14fd2a462b1d4f7f96e34301b5957b3636776fdf 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -641,12 +641,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
                        Alert::alert(_("Textclass Loading Error!"),
                                   boost::io::str(boost::format(_("Can't load textclass %1$s")) %
                                   params.getLyXTextClass().name()),
-                                  _("-- substituting default"));
+                                  _("-- substituting default."));
 #else
                        Alert::alert(_("Textclass Loading Error!"),
                                     _("Can't load textclass ")
                                     + params.getLyXTextClass().name(),
-                                    _("-- substituting default"));
+                                    _("-- substituting default."));
 #endif
                        params.textclass = 0;
                }

diff --git a/src/bufferview_funcs.C b/src/bufferview_funcs.C
index bb7678b51847eb2a11091c9368e92bf78ba6cac1..17b68935572b6290cb6387d2215755f5fb542bd2 100644 (file)
--- a/src/bufferview_funcs.C
+++ b/src/bufferview_funcs.C
@@ -188,7 +188,7 @@ string const currentState(BufferView * bv)
                        state << _("Single");
                        break;
                case Spacing::Onehalf:
-                       state << _("Onehalf");
+                       state << _("OneHalf");
                        break;
                case Spacing::Double:
                        state << _("Double");

diff --git a/src/frontends/gnome/GLog.C b/src/frontends/gnome/GLog.C
index e2cd9c9a16295f61780e18d9565f71469d841ebe..219edf1ab630410cabee082a4aaeea1135b12b72 100644 (file)
--- a/src/frontends/gnome/GLog.C
+++ b/src/frontends/gnome/GLog.C
@@ -61,9 +61,9 @@ void GLog::update()
        ifstream ifstr(logfile.second.c_str());
        if (!ifstr) {
                if (logfile.first == Buffer::buildlog)
-                       log_text()->get_buffer()->set_text(_("No build log file found"));
+                       log_text()->get_buffer()->set_text(_("No build log file found."));
                else
-                       log_text()->get_buffer()->set_text(_("No LaTeX log file found"));
+                       log_text()->get_buffer()->set_text(_("No LaTeX log file found."));
                return;
        }
 

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 3542caa4cbe471fbb2ed27223813d0ab01e26461..df55f03cf206ca9e02acdb7112949754d773d309 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,15 @@
+2003-01-23  John Levon  <levon@movementarian.org>
+
+       * ui/*.ui: move several group box labels to title capitalisation
+
+2003-01-20  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * QDocument.C: rename "Xxxskip" to "XxxSkip"
+       * QGraphicsDialog.C:
+       * QLog.C: Make output messages identical to other messages 
+       * ui/*.ui: In strings, remove space in front of colon 
+        ("... :" => "...:") for harmonization with xforms labels
+
 2003-01-16  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
        * ui/QDocumentDialogBase.ui:

diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C
index 4736cf27f3b17bda9302aef520cca8d5effe88dd..cf8da76e9bbe3ca2ba81309e9d4d0799e310ccaf 100644 (file)
--- a/src/frontends/qt2/QDocument.C
+++ b/src/frontends/qt2/QDocument.C
@@ -128,9 +128,9 @@ void QDocument::build_dialog()
        dialog_->layoutModule->fontsizeCO->insertItem(qt_("11"));
        dialog_->layoutModule->fontsizeCO->insertItem(qt_("12"));
 
-       dialog_->layoutModule->skipCO->insertItem(qt_("Smallskip"));
-       dialog_->layoutModule->skipCO->insertItem(qt_("Medskip"));
-       dialog_->layoutModule->skipCO->insertItem(qt_("Bigskip"));
+       dialog_->layoutModule->skipCO->insertItem(qt_("SmallSkip"));
+       dialog_->layoutModule->skipCO->insertItem(qt_("MedSkip"));
+       dialog_->layoutModule->skipCO->insertItem(qt_("BigSkip"));
        dialog_->layoutModule->skipCO->insertItem(qt_("Length"));
 
        dialog_->layoutModule->pagestyleCO->insertItem(qt_("default"));

diff --git a/src/frontends/qt2/QGraphicsDialog.C b/src/frontends/qt2/QGraphicsDialog.C
index 75c8e6e589c1d37ec5621365524035ef603e500c..67b0c7a248eaf05993345bf474076cff1d77a8cc 100644 (file)
--- a/src/frontends/qt2/QGraphicsDialog.C
+++ b/src/frontends/qt2/QGraphicsDialog.C
@@ -92,7 +92,7 @@ void QGraphicsDialog::browse_clicked()
 {
        QString file = QFileDialog::getOpenFileName(
                QString::null, qt_("Files (*)"),
-               this, 0, qt_("Select a graphic file"));
+               this, 0, qt_("Select graphics file"));
        if (!file.isNull()) {
                filename->setText(file);
                form_->changed();

diff --git a/src/frontends/qt2/QLog.C b/src/frontends/qt2/QLog.C
index 2f8faefd7e8fb2ae16d0b6edbca336c70259ef2a..96bc808663a3bbcadf84c4551d299f0582587866 100644 (file)
--- a/src/frontends/qt2/QLog.C
+++ b/src/frontends/qt2/QLog.C
@@ -62,9 +62,9 @@ void QLog::update_contents()
        ifstream ifstr(logfile.second.c_str());
        if (!ifstr) {
                if (logfile.first == Buffer::buildlog)
-                       dialog_->logTV->setText(qt_("No build log file found"));
+                       dialog_->logTV->setText(qt_("No build log file found."));
                else
-                       dialog_->logTV->setText(qt_("No LaTeX log file found"));
+                       dialog_->logTV->setText(qt_("No LaTeX log file found."));
                return;
        }
 

diff --git a/src/frontends/qt2/QLyXKeySym.C b/src/frontends/qt2/QLyXKeySym.C
index 45d8c51aecdc8b83030f17e784e2aeb319520041..e68a93deb5aac64d74c2172ed4e1477bcdef9003 100644 (file)
--- a/src/frontends/qt2/QLyXKeySym.C
+++ b/src/frontends/qt2/QLyXKeySym.C
@@ -151,6 +151,7 @@ string QLyXKeySym::getSymbolName() const
 
 char QLyXKeySym::getISOEncoded(string const & encoding) const
 {
+       lyxerr[Debug::KEY] << "encoding is " << encoding << endl;
        unsigned char const c = encode(encoding, text_);
        lyxerr[Debug::KEY] << "ISOEncoded returning value " << int(c) << endl;
        return c;

diff --git a/src/frontends/qt2/lyx_gui.C b/src/frontends/qt2/lyx_gui.C
index a2dc25dbf3941ada37c3c7fda72103ef9d14aca7..d5eca643e5447ece838eade57d652c6498bf765a 100644 (file)
--- a/src/frontends/qt2/lyx_gui.C
+++ b/src/frontends/qt2/lyx_gui.C
@@ -91,7 +91,7 @@ extern bool lyxX11EventFilter(XEvent * xev);
 class LQApplication : public QApplication
 {
 public:
-       LQApplication(int &argc, char **argv);
+       LQApplication(int & argc, char ** argv);
        ~LQApplication();
 #ifdef Q_WS_X11
        bool x11EventFilter (XEvent * ev) { return lyxX11EventFilter(ev); }
@@ -99,8 +99,8 @@ public:
 };
 
 
-LQApplication::LQApplication(int &argc, char **argv)
-       : QApplication( argc, argv )
+LQApplication::LQApplication(int & argc, char ** argv)
+       : QApplication(argc, argv)
 {}
 
 

diff --git a/src/frontends/qt2/ui/ClassModuleBase.ui b/src/frontends/qt2/ui/ClassModuleBase.ui
index e7f8eb5520d34666594f35bd2aa079ed7f5c9391..4954bc00366a46f960d1294448874efa346856d7 100644 (file)
--- a/src/frontends/qt2/ui/ClassModuleBase.ui
+++ b/src/frontends/qt2/ui/ClassModuleBase.ui
@@ -38,7 +38,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Document &amp;class :</string>
+                <string>Document &amp;class:</string>
             </property>
             <property>
                 <name>buddy</name>
@@ -74,7 +74,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Op&amp;tions :</string>
+                <string>Op&amp;tions:</string>
             </property>
             <property>
                 <name>buddy</name>
@@ -103,7 +103,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Page &amp;style :</string>
+                <string>Page &amp;style:</string>
             </property>
             <property>
                 <name>buddy</name>
@@ -252,7 +252,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>&amp;Font &amp;&amp; size :</string>
+                <string>&amp;Font &amp;&amp; size:</string>
             </property>
             <property>
                 <name>buddy</name>
@@ -267,7 +267,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>&amp;Line spacing :</string>
+                <string>&amp;Line spacing:</string>
             </property>
             <property>
                 <name>buddy</name>

diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt2/ui/LanguageModuleBase.ui
index 85b830a4a5e1a021edf9364de25ad3b0e2a81173..932801b73f078980a53cc98042c4d0b7afe9155d 100644 (file)
--- a/src/frontends/qt2/ui/LanguageModuleBase.ui
+++ b/src/frontends/qt2/ui/LanguageModuleBase.ui
@@ -38,7 +38,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>Quote style</string>
+                <string>Quote Style</string>
             </property>
             <property stdset="1">
                 <name>exclusive</name>

diff --git a/src/frontends/qt2/ui/NumberingModuleBase.ui b/src/frontends/qt2/ui/NumberingModuleBase.ui
index 13906a646895dbe86b57579793eb91b03612cec5..5c06ac6998529c7ee2039a04f9498893ad6c125d 100644 (file)
--- a/src/frontends/qt2/ui/NumberingModuleBase.ui
+++ b/src/frontends/qt2/ui/NumberingModuleBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>216</width>
+            <width>234</width>
             <height>105</height>
         </rect>
     </property>
@@ -42,7 +42,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>Numbering depth</string>
+                <string>Numbering Depth</string>
             </property>
             <grid>
                 <property stdset="1">
@@ -61,7 +61,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Section :</string>
+                        <string>&amp;Section:</string>
                     </property>
                     <property>
                         <name>buddy</name>
@@ -76,7 +76,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Table of contents :</string>
+                        <string>&amp;Table of contents:</string>
                     </property>
                     <property>
                         <name>buddy</name>

diff --git a/src/frontends/qt2/ui/PackagesModuleBase.ui b/src/frontends/qt2/ui/PackagesModuleBase.ui
index 2c92a38b8193dcf47eea98e4258d90ad2d9d304a..6bbeec9da13b4f5d11992545160cf52c70e71ff2 100644 (file)
--- a/src/frontends/qt2/ui/PackagesModuleBase.ui
+++ b/src/frontends/qt2/ui/PackagesModuleBase.ui
@@ -89,7 +89,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Postscript &amp;driver :</string>
+                        <string>Postscript &amp;driver:</string>
                     </property>
                     <property>
                         <name>buddy</name>

diff --git a/src/frontends/qt2/ui/PaperModuleBase.ui b/src/frontends/qt2/ui/PaperModuleBase.ui
index ec01f7718c3977621c6754e17365a0e2adc9fad3..9f803f307c9798010eea022e7059aaaecde6e792 100644 (file)
--- a/src/frontends/qt2/ui/PaperModuleBase.ui
+++ b/src/frontends/qt2/ui/PaperModuleBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>235</width>
+            <width>231</width>
             <height>269</height>
         </rect>
     </property>
@@ -81,7 +81,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>Paper size</string>
+                <string>Paper Size</string>
             </property>
             <property stdset="1">
                 <name>orientation</name>

diff --git a/src/frontends/qt2/ui/QCharacterDialogBase.ui b/src/frontends/qt2/ui/QCharacterDialogBase.ui
index 354aedd1fd959fd634fdbe7c3bf18bdbaa7c3367..1a2a70fb0e818334209d0beaeed74a5344eccca2 100644 (file)
--- a/src/frontends/qt2/ui/QCharacterDialogBase.ui
+++ b/src/frontends/qt2/ui/QCharacterDialogBase.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>368</width>
-            <height>256</height>
+            <width>449</width>
+            <height>368</height>
         </rect>
     </property>
     <property stdset="1">
@@ -61,10 +61,6 @@
                         <name>name</name>
                         <cstring>charGB</cstring>
                     </property>
-                    <property stdset="1">
-                        <name>title</name>
-                        <string>Character</string>
-                    </property>
                     <property stdset="1">
                         <name>sizePolicy</name>
                         <sizepolicy>
@@ -72,6 +68,10 @@
                             <vsizetype>5</vsizetype>
                         </sizepolicy>
                     </property>
+                    <property stdset="1">
+                        <name>title</name>
+                        <string>Character</string>
+                    </property>
                     <property>
                         <name>layoutMargin</name>
                     </property>
@@ -299,7 +299,7 @@
                             </property>
                             <property stdset="1">
                                 <name>title</name>
-                                <string>Never toggled</string>
+                                <string>Never Toggled</string>
                             </property>
                             <property>
                                 <name>layoutMargin</name>
@@ -353,7 +353,7 @@
                             </property>
                             <property stdset="1">
                                 <name>title</name>
-                                <string>Always toggled</string>
+                                <string>Always Toggled</string>
                             </property>
                             <property>
                                 <name>layoutMargin</name>

diff --git a/src/frontends/qt2/ui/QERTDialogBase.ui b/src/frontends/qt2/ui/QERTDialogBase.ui
index 3cc895c701c72ac93cd2654e7f23e9193e9264ce..2f23ab6258b14748f52c5d1fb91366be30f87a9a 100644 (file)
--- a/src/frontends/qt2/ui/QERTDialogBase.ui
+++ b/src/frontends/qt2/ui/QERTDialogBase.ui
@@ -42,7 +42,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>ERT inset display</string>
+                <string>Display</string>
             </property>
             <vbox>
                 <property stdset="1">

diff --git a/src/frontends/qt2/ui/QFloatDialogBase.ui b/src/frontends/qt2/ui/QFloatDialogBase.ui
index 9734ca495628728baa83ec6024e4c2a5a6bbae66..5afbfb90b2592a1c2af8c0106fe71b5dbd9af121 100644 (file)
--- a/src/frontends/qt2/ui/QFloatDialogBase.ui
+++ b/src/frontends/qt2/ui/QFloatDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>369</width>
+            <width>381</width>
             <height>259</height>
         </rect>
     </property>
@@ -57,7 +57,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>Advanced placement options</string>
+                <string>Advanced Placement Options</string>
             </property>
             <hbox>
                 <property stdset="1">

diff --git a/src/frontends/qt2/ui/QGraphicsDialogBase.ui b/src/frontends/qt2/ui/QGraphicsDialogBase.ui
index 77bb7f563f5167cd4d7d947cfbf0a34b2a78bdd6..fb90eed019007be1654184c06a62ac2b4a3a1a79 100644 (file)
--- a/src/frontends/qt2/ui/QGraphicsDialogBase.ui
+++ b/src/frontends/qt2/ui/QGraphicsDialogBase.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>379</width>
-            <height>390</height>
+            <width>464</width>
+            <height>492</height>
         </rect>
     </property>
     <property stdset="1">
@@ -116,7 +116,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>&amp;Browse ...</string>
+                                    <string>&amp;Browse...</string>
                                 </property>
                                 <property>
                                     <name>toolTip</name>
@@ -133,7 +133,7 @@
                         </property>
                         <property stdset="1">
                             <name>title</name>
-                            <string>LyX display</string>
+                            <string>LyX Display</string>
                         </property>
                         <grid>
                             <property stdset="1">
@@ -167,7 +167,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Display :</string>
+                                    <string>Display:</string>
                                 </property>
                                 <property>
                                     <name>buddy</name>
@@ -221,7 +221,7 @@
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Scale :</string>
+                                    <string>Scale:</string>
                                 </property>
                                 <property>
                                     <name>buddy</name>
@@ -1022,7 +1022,7 @@
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Ca&amp;ption :</string>
+                            <string>Ca&amp;ption:</string>
                         </property>
                         <property>
                             <name>buddy</name>

diff --git a/src/frontends/qt2/ui/QParagraphDialogBase.ui b/src/frontends/qt2/ui/QParagraphDialogBase.ui
index 6f52fbc0a0725816da3b137f86361386ee3c1687..0ba4d3c8377997228c91275bf78271ba60a3f869 100644 (file)
--- a/src/frontends/qt2/ui/QParagraphDialogBase.ui
+++ b/src/frontends/qt2/ui/QParagraphDialogBase.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>399</width>
+            <width>395</width>
             <height>292</height>
         </rect>
     </property>
@@ -604,7 +604,7 @@
                         </property>
                         <property stdset="1">
                             <name>title</name>
-                            <string>&amp;Page breaks</string>
+                            <string>&amp;Page Breaks</string>
                         </property>
                         <vbox>
                             <property stdset="1">

diff --git a/src/frontends/qt2/ui/QPreambleDialogBase.ui b/src/frontends/qt2/ui/QPreambleDialogBase.ui
index cb83d32324bb921b07cf043509089f4582f2026a..cf4b4bfdf42129fda78adfa1079142364d5b355f 100644 (file)
--- a/src/frontends/qt2/ui/QPreambleDialogBase.ui
+++ b/src/frontends/qt2/ui/QPreambleDialogBase.ui
@@ -68,7 +68,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Edit ...</string>
+                        <string>&amp;Edit...</string>
                     </property>
                     <property stdset="1">
                         <name>default</name>

diff --git a/src/frontends/qt2/ui/QPrefColorsModule.ui b/src/frontends/qt2/ui/QPrefColorsModule.ui
index 78498b8b97cca06f9989873f341465bc3be0ab24..a550d3217c64caa421faca378aef5e897d9b1111 100644 (file)
--- a/src/frontends/qt2/ui/QPrefColorsModule.ui
+++ b/src/frontends/qt2/ui/QPrefColorsModule.ui
@@ -90,7 +90,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>&amp;Alter ...</string>
+                                <string>&amp;Alter...</string>
                             </property>
                         </widget>
                         <spacer>

diff --git a/src/frontends/qt2/ui/QPrefLatexModule.ui b/src/frontends/qt2/ui/QPrefLatexModule.ui
index 3e3ab00aa8e94f1adbee2f992a4305b659ff1f77..64134a2e7ea0740bb9f7937cfe5ed4a886c77979 100644 (file)
--- a/src/frontends/qt2/ui/QPrefLatexModule.ui
+++ b/src/frontends/qt2/ui/QPrefLatexModule.ui
@@ -13,7 +13,7 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>343</width>
+            <width>376</width>
             <height>237</height>
         </rect>
     </property>
@@ -200,7 +200,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>External applications</string>
+                <string>External Applications</string>
             </property>
             <grid>
                 <property stdset="1">
@@ -219,7 +219,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Chec&amp;kTeX command :</string>
+                        <string>Chec&amp;kTeX command:</string>
                     </property>
                     <property>
                         <name>buddy</name>

diff --git a/src/frontends/qt2/ui/QPrefPathsModule.ui b/src/frontends/qt2/ui/QPrefPathsModule.ui
index 2f727fd76b8d89101452e5eb73ed08fac1efa75b..19c26fe4b50d7c20599b1c830adf875db92519af 100644 (file)
--- a/src/frontends/qt2/ui/QPrefPathsModule.ui
+++ b/src/frontends/qt2/ui/QPrefPathsModule.ui
@@ -104,7 +104,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Backup directory :</string>
+                        <string>&amp;Backup directory:</string>
                     </property>
                     <property>
                         <name>buddy</name>
@@ -119,7 +119,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Document templates :</string>
+                        <string>&amp;Document templates:</string>
                     </property>
                     <property>
                         <name>buddy</name>
@@ -134,7 +134,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Ly&amp;XServer pipe :</string>
+                        <string>Ly&amp;XServer pipe:</string>
                     </property>
                     <property>
                         <name>buddy</name>
@@ -197,7 +197,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Working directory :</string>
+                        <string>&amp;Working directory:</string>
                     </property>
                     <property>
                         <name>buddy</name>

diff --git a/src/frontends/qt2/ui/QPrefPrinterModule.ui b/src/frontends/qt2/ui/QPrefPrinterModule.ui
index 3253fb1ae1a8499109dff898f755e4d8c71aee90..b77e0d4096ed496bd458be1b8e9ce15140e748e4 100644 (file)
--- a/src/frontends/qt2/ui/QPrefPrinterModule.ui
+++ b/src/frontends/qt2/ui/QPrefPrinterModule.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>385</width>
-            <height>384</height>
+            <width>433</width>
+            <height>485</height>
         </rect>
     </property>
     <property stdset="1">
@@ -68,7 +68,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Printer &amp;name :</string>
+                                <string>Printer &amp;name:</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -156,7 +156,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>Command options</string>
+                <string>Command Options</string>
             </property>
             <grid>
                 <property stdset="1">

diff --git a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui
index 7fd2edd6e490659074c3c3cc49d84fedbed4106d..a2b7a77aa9ceed3d5958c0b02fcaf968d5b0efaa 100644 (file)
--- a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui
+++ b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>321</width>
-            <height>344</height>
+            <width>346</width>
+            <height>441</height>
         </rect>
     </property>
     <property stdset="1">
@@ -107,7 +107,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>Sa&amp;ns Serif :</string>
+                                <string>Sa&amp;ns Serif:</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -154,7 +154,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>T&amp;ypewriter :</string>
+                                <string>T&amp;ypewriter:</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -169,7 +169,7 @@
                             </property>
                             <property stdset="1">
                                 <name>text</name>
-                                <string>&amp;Roman :</string>
+                                <string>&amp;Roman:</string>
                             </property>
                             <property>
                                 <name>buddy</name>
@@ -320,7 +320,7 @@
             </property>
             <property stdset="1">
                 <name>title</name>
-                <string>Font sizes</string>
+                <string>Font Sizes</string>
             </property>
             <grid>
                 <property stdset="1">

diff --git a/src/frontends/qt2/ui/QPrefUIModule.ui b/src/frontends/qt2/ui/QPrefUIModule.ui
index 9da3cc4253533a9667c2a5fe8b08baf5b0df893e..9403de11ec18352b699c55388f83d91daa08c5fa 100644 (file)
--- a/src/frontends/qt2/ui/QPrefUIModule.ui
+++ b/src/frontends/qt2/ui/QPrefUIModule.ui
@@ -13,8 +13,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>436</width>
-            <height>213</height>
+            <width>477</width>
+            <height>341</height>
         </rect>
     </property>
     <property stdset="1">
@@ -170,7 +170,7 @@
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string>W&amp;heel mouse scroll :</string>
+                                        <string>W&amp;heel mouse scroll:</string>
                                     </property>
                                     <property>
                                         <name>buddy</name>
@@ -335,7 +335,7 @@
                                     </property>
                                     <property stdset="1">
                                         <name>text</name>
-                                        <string>&amp;Maximum last files :</string>
+                                        <string>&amp;Maximum last files:</string>
                                     </property>
                                     <property>
                                         <name>buddy</name>

diff --git a/src/frontends/qt2/ui/QPrintDialogBase.ui b/src/frontends/qt2/ui/QPrintDialogBase.ui
index 458a84d8f5c1d9b68bf835b0b1ba9e1d76239db1..cae3fbb5af508b24a322125222605d7c2f230f05 100644 (file)
--- a/src/frontends/qt2/ui/QPrintDialogBase.ui
+++ b/src/frontends/qt2/ui/QPrintDialogBase.ui
@@ -458,7 +458,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>&amp;Browse ...</string>
+                        <string>&amp;Browse...</string>
                     </property>
                 </widget>
             </grid>

diff --git a/src/frontends/qt2/ui/QSearchDialogBase.ui b/src/frontends/qt2/ui/QSearchDialogBase.ui
index 0190d3975238951a88e412537c11c930a0d45dd2..c966f8031c6d98c340eb594e53565e7c8ece4b2f 100644 (file)
--- a/src/frontends/qt2/ui/QSearchDialogBase.ui
+++ b/src/frontends/qt2/ui/QSearchDialogBase.ui
@@ -281,7 +281,7 @@
             </property>
             <property stdset="1">
                 <name>text</name>
-                <string>Replace &amp;All </string>
+                <string>Replace &amp;All</string>
             </property>
         </widget>
         <widget row="5"  column="0"  rowspan="1"  colspan="2" >

diff --git a/src/frontends/qt2/ui/QShowFileDialogBase.ui b/src/frontends/qt2/ui/QShowFileDialogBase.ui
index 3144f195a4fef87f50f9e33275a6ed7c6ce30374..20d68fff98668ea89b33b985b24d7be1bcdcf7d5 100644 (file)
--- a/src/frontends/qt2/ui/QShowFileDialogBase.ui
+++ b/src/frontends/qt2/ui/QShowFileDialogBase.ui
@@ -19,7 +19,7 @@
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string>File: </string>
+        <string>File:</string>
     </property>
     <property stdset="1">
         <name>sizeGripEnabled</name>

diff --git a/src/frontends/qt2/ui/QTabularDialogBase.ui b/src/frontends/qt2/ui/QTabularDialogBase.ui
index 3ef939529d642792fb5244efd7bd64c065a3a009..f498df48ec70a6b5be927a718cd3a4996bb417c4 100644 (file)
--- a/src/frontends/qt2/ui/QTabularDialogBase.ui
+++ b/src/frontends/qt2/ui/QTabularDialogBase.ui
@@ -1234,7 +1234,7 @@
                     </property>
                     <property stdset="1">
                         <name>text</name>
-                        <string>Current cell :</string>
+                        <string>Current cell:</string>
                     </property>
                 </widget>
                 <widget>

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 3fa02178988ac1951743906c3fe64e54b2370947..4e7132126af93808bd412ec73b6466b836ba2151 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-20  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * forms/*.fd: Missing colons (':') added to labels,
+        all labels (except "deg") start with a capital letter now
+       * formDocument.C:
+       * formParagraph.C: rename "Xxxskip" to "XxxSkip"
+
 2003-01-15  Angus Leeming  <leeming@lyx.org>
 
        * forms/form_graphics.fd: s/Ok/OK/ consistent with all other dialogs.

diff --git a/src/frontends/xforms/FormDocument.C b/src/frontends/xforms/FormDocument.C
index 7dbe15dc348f23d8811a7f9fe81df031754ad3c4..566e03265facdc8094ff7910983519a671804857 100644 (file)
--- a/src/frontends/xforms/FormDocument.C
+++ b/src/frontends/xforms/FormDocument.C
@@ -158,7 +158,7 @@ void FormDocument::build()
        fl_addto_choice(class_->choice_doc_pagestyle,
                        "default|empty|plain|headings|fancy");
        fl_addto_choice(class_->choice_doc_skip,
-                       _(" Smallskip | Medskip | Bigskip | Length "));
+                       _(" SmallSkip | MedSkip | BigSkip | Length "));
        fl_addto_choice(class_->choice_doc_skip_units,  units.c_str());
 
        // Set input filters on doc spacing to make it accept only
@@ -605,7 +605,7 @@ bool FormDocument::class_apply(BufferParams &params)
        bool redo = false;
 
        // If default skip is a "Length" but there's no text in the
-       // input field, reset the kind to "Medskip", which is the default.
+       // input field, reset the kind to "MedSkip", which is the default.
        if (fl_get_choice(class_->choice_doc_skip) == 4 &&
            getString(class_->input_doc_skip).empty()) {
                fl_set_choice(class_->choice_doc_skip, 2);

diff --git a/src/frontends/xforms/FormParagraph.C b/src/frontends/xforms/FormParagraph.C
index a1126366b73ea0a74f2ef73faedc42c00ecb3d1a..31d7283442f4ef12d9cbd68bb5182b97028e380e 100644 (file)
--- a/src/frontends/xforms/FormParagraph.C
+++ b/src/frontends/xforms/FormParagraph.C
@@ -129,7 +129,7 @@ void FormParagraph::build()
        alignment_.init(dialog_->radio_align_block,  LYX_ALIGN_BLOCK);
        alignment_.init(dialog_->radio_align_center, LYX_ALIGN_CENTER);
 
-       string const parspacing = _("None|Defskip|Smallskip|Medskip|Bigskip|VFill|Length");
+       string const parspacing = _("None|DefSkip|SmallSkip|MedSkip|BigSkip|VFill|Length");
        fl_addto_choice(dialog_->choice_space_above, parspacing.c_str());
        fl_addto_choice(dialog_->choice_space_below, parspacing.c_str());
 

diff --git a/src/frontends/xforms/forms/form_character.fd b/src/frontends/xforms/forms/form_character.fd
index 4425d27ba69f32e124b9e31230e3ff34f1f60ed7..c0f0c7af21bc6f51ef82bd12f54a2b992eab0119 100644 (file)
--- a/src/frontends/xforms/forms/form_character.fd
+++ b/src/frontends/xforms/forms/form_character.fd
@@ -113,7 +113,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Size:|#Z
+label: Size:|#z
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast

diff --git a/src/frontends/xforms/forms/form_document.fd b/src/frontends/xforms/forms/form_document.fd
index 2950b54e3b70ecb8cab66af87494e97b02c998c4..54de2d0c387a04279eaf7051a69aacda0cae18bc 100644 (file)
--- a/src/frontends/xforms/forms/form_document.fd
+++ b/src/frontends/xforms/forms/form_document.fd
@@ -1574,7 +1574,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Size|#z
+label: Size:|#z
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1592,7 +1592,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_FIXED_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: LaTeX|#L
+label: LaTeX:|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_external.fd b/src/frontends/xforms/forms/form_external.fd
index f37d24fa18e49e2e91dfa66d409c0794909d7648..90a82c2b59fa6490342d8d9d8743af1a445e9932 100644 (file)
--- a/src/frontends/xforms/forms/form_external.fd
+++ b/src/frontends/xforms/forms/form_external.fd
@@ -40,7 +40,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Template|#t
+label: Template:|#t
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NorthWest FL_NorthEast
@@ -76,7 +76,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: File|#F
+label: File:|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthWest FL_SouthEast
@@ -112,7 +112,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Parameters|#P
+label: Parameters:|#P
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthWest FL_SouthEast

diff --git a/src/frontends/xforms/forms/form_forks.fd b/src/frontends/xforms/forms/form_forks.fd
index 3e8db0d796b44174b01e6dbaa36f50ea7948c2b7..7eeda5193aa76f41bfedf0fa960b7032e75bb4a1 100644 (file)
--- a/src/frontends/xforms/forms/form_forks.fd
+++ b/src/frontends/xforms/forms/form_forks.fd
@@ -40,7 +40,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Forked child processes|#F
+label: Forked child processes:|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -58,7 +58,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Kill processes|#K
+label: Kill processes:|#K
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_graphics.fd b/src/frontends/xforms/forms/form_graphics.fd
index 5ef20c9bdfec6e5bf54f75514f93385c6c620af6..f63805540a82a23cc78b92ec33313259b361a8de 100644 (file)
--- a/src/frontends/xforms/forms/form_graphics.fd
+++ b/src/frontends/xforms/forms/form_graphics.fd
@@ -173,7 +173,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: File|#F
+label: File:|#F
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_North FL_NorthEast
@@ -263,7 +263,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Scale|#S
+label: Scale:|#S
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East
@@ -281,7 +281,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Width|#W
+label: Width:|#W
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East
@@ -353,7 +353,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Height|#H
+label: Height:|#H
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East
@@ -389,7 +389,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Display|#D
+label: Display:|#D
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_East FL_East
@@ -431,7 +431,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Right top|#R
+label: Right top:|#R
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_North FL_North
@@ -467,7 +467,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Left bottom|#L
+label: Left bottom:|#L
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_North FL_North
@@ -635,7 +635,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: LaTeX options|#L
+label: LaTeX options:|#L
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East
@@ -671,7 +671,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Origin|#O
+label: Origin:|#O
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_North FL_North
@@ -689,7 +689,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Subfigure|#S
+label: Subfigure:|#S
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_West FL_West
@@ -707,7 +707,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Angle|#A
+label: Angle:|#A
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_North FL_North

diff --git a/src/frontends/xforms/forms/form_index.fd b/src/frontends/xforms/forms/form_index.fd
index 81518fe88b503abfecc6f198054d1b6af0c7ae7c..efad37bfe16257290abcdd98c4c0b1e6f248e0df 100644 (file)
--- a/src/frontends/xforms/forms/form_index.fd
+++ b/src/frontends/xforms/forms/form_index.fd
@@ -40,7 +40,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Keyword|#K
+label: Keyword:|#K
 shortcut:
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_maths_matrix.fd b/src/frontends/xforms/forms/form_maths_matrix.fd
index 769b29a9007d72b71e3df470aaf2e376cfffe2c3..21ce9f933a13bf1efcc083f11c5e06385547c611 100644 (file)
--- a/src/frontends/xforms/forms/form_maths_matrix.fd
+++ b/src/frontends/xforms/forms/form_maths_matrix.fd
@@ -41,7 +41,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Rows
+label: Rows:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -62,7 +62,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Columns 
+label: Columns:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -83,7 +83,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Vertical align|#V
+label: Vertical align:|#V
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -101,7 +101,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Horizontal align|#H
+label: Horizontal align:|#H
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_maths_panel.fd b/src/frontends/xforms/forms/form_maths_panel.fd
index 235b14f3d519df1cf4a339a783a4ddf2f764b428..b14138b81ed5891f138cb55c0f9e464c2fe98fc2 100644 (file)
--- a/src/frontends/xforms/forms/form_maths_panel.fd
+++ b/src/frontends/xforms/forms/form_maths_panel.fd
@@ -59,7 +59,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Functions
+label: Functions:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_SouthEast

diff --git a/src/frontends/xforms/forms/form_preferences.fd b/src/frontends/xforms/forms/form_preferences.fd
index eb2c170bdadd2c28788dc2f62031acfd31229026..0e08ad6790687d6aa85900540d78040cde276419 100644 (file)
--- a/src/frontends/xforms/forms/form_preferences.fd
+++ b/src/frontends/xforms/forms/form_preferences.fd
@@ -269,7 +269,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Roman|#R
+label: Roman:|#R
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -287,7 +287,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Sans Serif|#S
+label: Sans Serif:|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -305,7 +305,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Typewriter|#T
+label: Typewriter:|#T
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -323,7 +323,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Encoding|#E
+label: Encoding:|#E
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -360,7 +360,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Zoom %|#Z
+label: Zoom %:|#Z
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -382,7 +382,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Screen DPI|#D
+label: Screen DPI:|#D
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -404,7 +404,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: tiny
+label: Tiny:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -422,7 +422,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: smallest
+label: Smallest:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -440,7 +440,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: smaller
+label: Smaller:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -458,7 +458,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: small
+label: Small:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -476,7 +476,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: normal
+label: Normal:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -494,7 +494,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: large
+label: Large:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -512,7 +512,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: larger
+label: Larger:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -530,7 +530,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: largest
+label: Largest:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -548,7 +548,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: huge
+label: Huge:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -566,7 +566,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: huger
+label: Huger:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -644,7 +644,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Normal Font|#N
+label: Normal Font:|#N
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -662,7 +662,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bold Font|#B
+label: Bold Font:|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -680,7 +680,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Popup Encoding|#P
+label: Popup Encoding:|#P
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -716,7 +716,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: User Interface file|#U
+label: User Interface file:|#U
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -752,7 +752,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bind file|#f
+label: Bind file:|#f
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -812,7 +812,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: LyX objects|#L
+label: LyX objects:|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1151,7 +1151,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Wheel mouse jump
+label: Wheel mouse jump:
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
@@ -1173,7 +1173,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Autosave interval
+label: Autosave interval:
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
@@ -1214,7 +1214,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Graphics display|#G
+label: Graphics display:|#G
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_NoGravity FL_NoGravity
@@ -1256,7 +1256,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Spell command|#S
+label: Spell command:|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1274,7 +1274,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Use alternative language|#a
+label: Alternative language:|#a
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1310,7 +1310,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Use escape characters|#e
+label: Escape characters:|#e
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1346,7 +1346,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Use personal dictionary|#d
+label: Personal dictionary:|#d
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1532,7 +1532,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Package|#P
+label: Package:|#P
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1550,7 +1550,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Default language|#l
+label: Default language:|#l
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1586,7 +1586,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 1st|#1
+label: 1st:|#1
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1604,7 +1604,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: 2nd|#2
+label: 2nd:|#2
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1766,7 +1766,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Command start|#s
+label: Command start:|#s
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1784,7 +1784,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Command end|#e
+label: Command end:|#e
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1880,7 +1880,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: All formats|#l
+label: All formats:|#l
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1898,7 +1898,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Format|#F
+label: Format:|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1916,7 +1916,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: GUI name|#G
+label: GUI name:|#G
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1934,7 +1934,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Shortcut|#S
+label: Shortcut:|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1952,7 +1952,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Extension|#E
+label: Extension:|#E
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1970,7 +1970,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Viewer|#V
+label: Viewer:|#V
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2048,7 +2048,7 @@ alignment: FL_ALIGN_TOP
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: All converters|#l
+label: All converters:|#l
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2066,7 +2066,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: From|#F
+label: From:|#F
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2084,7 +2084,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: To|#T
+label: To:|#T
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2102,7 +2102,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Converter|#C
+label: Converter:|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2120,7 +2120,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Extra flags|#E
+label: Extra flags:|#E
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2198,7 +2198,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Default path|#p
+label: Default path:|#p
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2234,7 +2234,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Template path|#T
+label: Template path:|#T
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2270,7 +2270,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Temp dir|#d
+label: Temp dir:|#d
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2325,7 +2325,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Check last files|#C
+label: Check last files:|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2380,7 +2380,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Last file count|#L
+label: Last file count:|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2402,7 +2402,7 @@ alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Backup path|#B
+label: Backup path:|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2457,7 +2457,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: LyXServer pipe|#S
+label: LyXServer pipe:|#S
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2517,7 +2517,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: date format|#f
+label: Date format:|#f
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2559,7 +2559,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: name
+label: Name:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2577,7 +2577,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: adapt output
+label: Adapt output
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2613,7 +2613,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: command
+label: Command:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2631,7 +2631,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: page range
+label: Page range:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2649,7 +2649,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: copies
+label: Copies:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2667,7 +2667,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: reverse
+label: Reverse:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2685,7 +2685,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: to printer
+label: To printer:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2703,7 +2703,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: file extension
+label: File extension:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2721,7 +2721,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: spool command
+label: Spool command:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2739,7 +2739,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: paper type
+label: Paper type:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2757,7 +2757,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: even pages
+label: Even pages:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2775,7 +2775,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: odd pages
+label: Odd pages:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2793,7 +2793,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: collated
+label: Collated:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2811,7 +2811,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: landscape
+label: Landscape:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2829,7 +2829,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: to file
+label: To file:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2847,7 +2847,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: extra options
+label: Extra options:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2865,7 +2865,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: spool printer prefix
+label: Spool printer prefix:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2883,7 +2883,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: paper size
+label: Paper size:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2961,7 +2961,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Ascii line length|#A
+label: ASCII line length:|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -2983,7 +2983,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: TeX encoding|#T
+label: TeX encoding:|#T
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -3001,7 +3001,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Default paper size|#p
+label: Default paper size:|#p
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -3019,7 +3019,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Outside code interaction
+label: Outside Code Interaction
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -3037,7 +3037,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: ascii roff|#r
+label: ASCII roff:|#r
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -3055,7 +3055,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: checktex|#c
+label: Checktex:|#c
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -3073,7 +3073,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: DVI paper option|#D
+label: DVI paper option:|#D
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_print.fd b/src/frontends/xforms/forms/form_print.fd
index 7886431d2ba4411c057c542171e20dbf62fe5aa3..32af45e7420e37cae3567a8e37ac1fae97bf5e05 100644 (file)
--- a/src/frontends/xforms/forms/form_print.fd
+++ b/src/frontends/xforms/forms/form_print.fd
@@ -185,7 +185,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: to|#t
+label: To:|#T
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity
@@ -352,7 +352,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Printer|#P
+label: Printer:|#P
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_West FL_West
@@ -370,7 +370,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: File|#F
+label: File:|#F
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_West FL_West
@@ -442,7 +442,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: From|#m
+label: From:|#m
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_West FL_West

diff --git a/src/frontends/xforms/forms/form_ref.fd b/src/frontends/xforms/forms/form_ref.fd
index 3a1730b4d20891913669a1dd3af7d42d9aa828c0..61c9649254ff610cad68c653ab72842790e84515 100644 (file)
--- a/src/frontends/xforms/forms/form_ref.fd
+++ b/src/frontends/xforms/forms/form_ref.fd
@@ -167,7 +167,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Document|#D
+label: Document:|#D
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NorthWest FL_NorthEast
@@ -222,7 +222,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Format|#F
+label: Format:|#F
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_South FL_South

diff --git a/src/frontends/xforms/forms/form_sendto.fd b/src/frontends/xforms/forms/form_sendto.fd
index 1291e8e3a7ca162496df183bde8ac4bb659d78a6..67c6b5a5bb0094d3e4b25391d500dae5387653bd 100644 (file)
--- a/src/frontends/xforms/forms/form_sendto.fd
+++ b/src/frontends/xforms/forms/form_sendto.fd
@@ -40,7 +40,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Export format|#E
+label: Export format:|#E
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NorthWest FL_SouthEast
@@ -58,7 +58,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Command|#C
+label: Command:|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_SouthWest FL_SouthEast

diff --git a/src/frontends/xforms/forms/form_spellchecker.fd b/src/frontends/xforms/forms/form_spellchecker.fd
index 4629969893db4e064cdf106384f278098e6f71e0..deb84f83a1e448a7dec63656d32a65cc7aa4301e 100644 (file)
--- a/src/frontends/xforms/forms/form_spellchecker.fd
+++ b/src/frontends/xforms/forms/form_spellchecker.fd
@@ -41,7 +41,7 @@ alignment: FL_ALIGN_LEFT|FL_ALIGN_INSIDE
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Word count
+label: Word count:
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthWest FL_SouthWest

diff --git a/src/frontends/xforms/forms/form_tabular.fd b/src/frontends/xforms/forms/form_tabular.fd
index 4a1c7c084d8f5a9154fcbff37709bf92dea080e6..a0d178198d2a3e22029a443d6ed42e4e44936a8b 100644 (file)
--- a/src/frontends/xforms/forms/form_tabular.fd
+++ b/src/frontends/xforms/forms/form_tabular.fd
@@ -449,7 +449,7 @@ alignment: FL_ALIGN_BOTTOM_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bottom|#b
+label: Bottom|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -467,7 +467,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Left|#l
+label: Left|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -685,7 +685,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: LaTeX Argument|#A
+label: LaTeX Argument:|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -889,7 +889,7 @@ alignment: FL_ALIGN_BOTTOM_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Bottom|#b
+label: Bottom|#B
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -907,7 +907,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Left|#l
+label: Left|#L
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1143,7 +1143,7 @@ alignment: FL_ALIGN_TOP_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: LaTeX Argument|#A
+label: LaTeX Argument:|#A
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_tabular_create.fd b/src/frontends/xforms/forms/form_tabular_create.fd
index 2e0532e7e33f735f7e33afb72eff8f4add0822bc..47126c293be21163c18975d0bf85e307d9d90502 100644 (file)
--- a/src/frontends/xforms/forms/form_tabular_create.fd
+++ b/src/frontends/xforms/forms/form_tabular_create.fd
@@ -95,7 +95,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Columns
+label: Columns:
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity
@@ -113,7 +113,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Rows
+label: Rows:
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_NoGravity FL_NoGravity

diff --git a/src/frontends/xforms/forms/form_thesaurus.fd b/src/frontends/xforms/forms/form_thesaurus.fd
index a8dbe4d8d692a72fece1bf8b05dd473b9f29122c..55d9b5f287b5d6648fbb0da5c43c87f8aa6c7771 100644 (file)
--- a/src/frontends/xforms/forms/form_thesaurus.fd
+++ b/src/frontends/xforms/forms/form_thesaurus.fd
@@ -77,7 +77,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Entry : 
+label: Entry:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NorthWest FL_NorthWest
@@ -95,7 +95,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_DEFAULT_SIZE
 lcol: FL_BLACK
-label: Selection :
+label: Selection:
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NorthWest FL_NorthWest

diff --git a/src/frontends/xforms/forms/form_toc.fd b/src/frontends/xforms/forms/form_toc.fd
index d93f739f05718fadaca15c1960021132f6820a5f..a6ea906ed617bad204307a6057f0bb0c42eccc79 100644 (file)
--- a/src/frontends/xforms/forms/form_toc.fd
+++ b/src/frontends/xforms/forms/form_toc.fd
@@ -77,7 +77,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Type|#T
+label: Type:|#T
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_SouthWest FL_SouthWest

diff --git a/src/frontends/xforms/forms/form_url.fd b/src/frontends/xforms/forms/form_url.fd
index 88f11501f84aa384b5287d4bbb204aafde5da18a..86b3e274319745a07ac533be08efecab52391e51 100644 (file)
--- a/src/frontends/xforms/forms/form_url.fd
+++ b/src/frontends/xforms/forms/form_url.fd
@@ -41,7 +41,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: URL|#U
+label: URL:|#U
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East
@@ -59,7 +59,7 @@ alignment: FL_ALIGN_LEFT
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Name|#N
+label: Name:|#N
 shortcut: 
 resize: FL_RESIZE_X
 gravity: FL_West FL_East

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index f8c84220187704906d8acd4c4b698748339c7d16..9df1ee800dd52a067f15c423b67f23b183fb1eca 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-20  Michael Schmitt <michael.schmitt@teststep.org>
+
+       * insetert.C:
+       * insetgraphics.C:
+       * insettabular.C:
+       * insettext.C: Use error messages with identical spelling and punctuation
+
 2003-01-12  Michael Schmitt <michael.schmitt@teststep.org>
 
         * insetgraphics.C (draw, width): Fix spacing around graphics inset

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 57ef983965df57e9234021ca102227079fe715a9..58a796d02a5f52b122801187816b0431d90ab5fd 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -245,7 +245,7 @@ void InsetERT::setFont(BufferView *, LyXFont const &, bool, bool selectall)
        // if selectall is activated then the fontchange was an outside general
        // fontchange and this messages is not needed
        if (!selectall)
-               Alert::alert(_("Impossible Operation!"),
+               Alert::alert(_("Impossible operation!"),
                           _("Not permitted to change font-types inside ERT-insets!"),
                           _("Sorry."));
 }

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 3e075742e8b3221454e27cae3829cc908d86f7a7..59ff3d4e2e6253d9e5ce5ea2809ee3561352a472 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -772,11 +772,11 @@ int InsetGraphics::ascii(Buffer const *, ostream & os, int) const
        // at least we send the filename
 #if USE_BOOST_FORMAT
        os << '<'
-          << boost::format(_("Graphic file: %1$s")) % params().filename
+          << boost::format(_("Graphics file: %1$s")) % params().filename
           << ">\n";
 #else
        os << '<'
-          << _("Graphic file: ") << params().filename
+          << _("Graphics file: ") << params().filename
           << ">\n";
 #endif
        return 0;

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index fbe8c938e1247cca0100f21a48aabd902dc14082..61cc2ea0bb212b1b94f8e5224c2e9a02f3eac3d1 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -2087,7 +2087,7 @@ void InsetTabular::tabularFeatures(BufferView * bv,
        case LyXTabular::MULTICOLUMN:
        {
                if (sel_row_start != sel_row_end) {
-                       Alert::alert(_("Impossible Operation!"),
+                       Alert::alert(_("Impossible operation!"),
                                   _("Multicolumns can only be horizontally."),
                                   _("Sorry."));
                        return;

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 6bca675ce8e9f168e04583394603d6e08caffc09..0e39dbc75ef88bdf37838abe698c89e7e156df94 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -1408,7 +1408,7 @@ Inset::RESULT InsetText::localDispatch(FuncRequest const & ev)
                if (!autoBreakRows) {
 
                        if (CutAndPaste::nrOfParagraphs() > 1) {
-                               Alert::alert(_("Impossible operation"),
+                               Alert::alert(_("Impossible operation!"),
                                                   _("Cannot include more than one paragraph!"),
                                                   _("Sorry."));
                                break;

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 757487b531d9ce26a0715cdb6bfab8b71eda3565..56a059d7fffb2465a92cce0188f04fa0b7180f75 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -117,7 +117,7 @@ bool WriteAs(BufferView * bv, Buffer * buffer, string const & filename)
 
                FileDialog::Result result =
                        fileDlg.save(OnlyPath(fname),
-                                      _("*.lyx|LyX Documents (*.lyx)"),
+                                      _("*.lyx| LyX Documents (*.lyx)"),
                                       OnlyFilename(fname));
 
                if (result.first == FileDialog::Later)
@@ -444,7 +444,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               Alert::err_alert(_("Error! Cannot open specified file: "),
+               Alert::err_alert(_("Error! Cannot open specified file:"),
                             MakeDisplayPath(fname, 50));
                return string();
        }

diff --git a/src/lyx_main.C b/src/lyx_main.C
index 0b0e0802acc1b2a839ead9188544870fd9283a10..eb8bac0e895fff5468b9395b4b9908fd2963f436 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -93,10 +93,15 @@ LyX::LyX(int & argc, char * argv[])
        // #include "graphics/GraphicsTypes.h" at the top -- Rob Lahaye.
        grfx::setDisplayTranslator();
 
+       lyxerr << argc << endl;
+
        if (want_gui) {
+               lyxerr <<  "parsinint" << endl;
                lyx_gui::parse_init(argc, argv);
        }
 
+       lyxerr << argc << endl;
+
        // check for any spurious extra arguments
        // other than documents
        for (int argi = 1; argi < argc ; ++argi) {

diff --git a/src/lyxfont.C b/src/lyxfont.C
index 401b148accdb2df60d57e50a10c107baa8cccae9..a9e07de78ebe2978ea8f03057b44258ccd892498 100644 (file)
--- a/src/lyxfont.C
+++ b/src/lyxfont.C
@@ -42,7 +42,7 @@ using std::strlen;
 namespace {
 
 char const * GUIFamilyNames[LyXFont::NUM_FAMILIES + 2 /* default & error */] =
-{ N_("Roman"), N_("Sans serif"), N_("Typewriter"), N_("Symbol"),
+{ N_("Roman"), N_("Sans Serif"), N_("Typewriter"), N_("Symbol"),
   "cmr", "cmsy", "cmm", "cmex", "msa", "msb", "eufrak", "wasy",
   N_("Inherit"), N_("Ignore") };
 

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 2f9023a3cd6427a143ce63353a4f8802cda84fdc..df11e09024ccad5b34af39db75f6cfe47880216d 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -1646,7 +1646,7 @@ void LyXFunc::menuNew(string const & name, bool fromTemplate)
 
                FileDialog::Result result =
                        fileDlg.open(lyxrc.template_path,
-                                      _("*.lyx|LyX Documents (*.lyx)"));
+                                      _("*.lyx| LyX Documents (*.lyx)"));
 
                if (result.first == FileDialog::Later)
                        return;
@@ -1685,7 +1685,7 @@ void LyXFunc::open(string const & fname)
 
                FileDialog::Result result =
                        fileDlg.open(initpath,
-                                      "*.lyx|LyX Documents (*.lyx)");
+                                      _("*.lyx| LyX Documents (*.lyx)"));
 
                if (result.first == FileDialog::Later)
                        return;