From 2b2c661f84feaf3d84eca173353fc4245af361cd Mon Sep 17 00:00:00 2001 From: John Levon Date: Thu, 23 Jan 2003 16:23:43 +0000 Subject: [PATCH] Michael's text fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5980 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/BufferView.C | 3 +- src/BufferView_pimpl.C | 4 +- src/ChangeLog | 9 +- src/buffer.C | 4 +- src/bufferview_funcs.C | 2 +- src/frontends/gnome/GLog.C | 4 +- src/frontends/qt2/ChangeLog | 12 ++ src/frontends/qt2/QDocument.C | 6 +- src/frontends/qt2/QGraphicsDialog.C | 2 +- src/frontends/qt2/QLog.C | 4 +- src/frontends/qt2/QLyXKeySym.C | 1 + src/frontends/qt2/lyx_gui.C | 6 +- src/frontends/qt2/ui/ClassModuleBase.ui | 10 +- src/frontends/qt2/ui/LanguageModuleBase.ui | 2 +- src/frontends/qt2/ui/NumberingModuleBase.ui | 8 +- src/frontends/qt2/ui/PackagesModuleBase.ui | 2 +- src/frontends/qt2/ui/PaperModuleBase.ui | 4 +- src/frontends/qt2/ui/QCharacterDialogBase.ui | 16 +- src/frontends/qt2/ui/QERTDialogBase.ui | 2 +- src/frontends/qt2/ui/QFloatDialogBase.ui | 4 +- src/frontends/qt2/ui/QGraphicsDialogBase.ui | 14 +- src/frontends/qt2/ui/QParagraphDialogBase.ui | 4 +- src/frontends/qt2/ui/QPreambleDialogBase.ui | 2 +- src/frontends/qt2/ui/QPrefColorsModule.ui | 2 +- src/frontends/qt2/ui/QPrefLatexModule.ui | 6 +- src/frontends/qt2/ui/QPrefPathsModule.ui | 8 +- src/frontends/qt2/ui/QPrefPrinterModule.ui | 8 +- .../qt2/ui/QPrefScreenFontsModule.ui | 12 +- src/frontends/qt2/ui/QPrefUIModule.ui | 8 +- src/frontends/qt2/ui/QPrintDialogBase.ui | 2 +- src/frontends/qt2/ui/QSearchDialogBase.ui | 2 +- src/frontends/qt2/ui/QShowFileDialogBase.ui | 2 +- src/frontends/qt2/ui/QTabularDialogBase.ui | 2 +- src/frontends/xforms/ChangeLog | 7 + src/frontends/xforms/FormDocument.C | 4 +- src/frontends/xforms/FormParagraph.C | 2 +- src/frontends/xforms/forms/form_character.fd | 2 +- src/frontends/xforms/forms/form_document.fd | 4 +- src/frontends/xforms/forms/form_external.fd | 6 +- src/frontends/xforms/forms/form_forks.fd | 4 +- src/frontends/xforms/forms/form_graphics.fd | 22 +-- src/frontends/xforms/forms/form_index.fd | 2 +- .../xforms/forms/form_maths_matrix.fd | 8 +- .../xforms/forms/form_maths_panel.fd | 2 +- .../xforms/forms/form_preferences.fd | 158 +++++++++--------- src/frontends/xforms/forms/form_print.fd | 8 +- src/frontends/xforms/forms/form_ref.fd | 4 +- src/frontends/xforms/forms/form_sendto.fd | 4 +- .../xforms/forms/form_spellchecker.fd | 2 +- src/frontends/xforms/forms/form_tabular.fd | 12 +- .../xforms/forms/form_tabular_create.fd | 4 +- src/frontends/xforms/forms/form_thesaurus.fd | 4 +- src/frontends/xforms/forms/form_toc.fd | 2 +- src/frontends/xforms/forms/form_url.fd | 4 +- src/insets/ChangeLog | 7 + src/insets/insetert.C | 2 +- src/insets/insetgraphics.C | 4 +- src/insets/insettabular.C | 2 +- src/insets/insettext.C | 2 +- src/lyx_cb.C | 4 +- src/lyx_main.C | 5 + src/lyxfont.C | 2 +- src/lyxfunc.C | 4 +- 63 files changed, 256 insertions(+), 218 deletions(-) diff --git a/src/BufferView.C b/src/BufferView.C index 905a8da346..95c03e8450 100644 --- 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 6ffe902921..ab27294eca 100644 --- 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 4543680061..77ed7ce57c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2003-01-20 Michael Schmitt + + * bufferview.C: + * lyxcb.C: + * lyxfunc.C: Output messages with identical spelling, punctuation, + and spaces + 2003-01-22 Michael Schmitt * 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 diff --git a/src/buffer.C b/src/buffer.C index d7d0a45631..14fd2a462b 100644 --- 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 bb7678b518..17b6893557 100644 --- 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 e2cd9c9a16..219edf1ab6 100644 --- 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 3542caa4cb..df55f03cf2 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,15 @@ +2003-01-23 John Levon + + * ui/*.ui: move several group box labels to title capitalisation + +2003-01-20 Michael Schmitt + + * 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 * ui/QDocumentDialogBase.ui: diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index 4736cf27f3..cf8da76e9b 100644 --- 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 75c8e6e589..67b0c7a248 100644 --- 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 2f8faefd7e..96bc808663 100644 --- 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 45d8c51aec..e68a93deb5 100644 --- 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 a2dc25dbf3..d5eca643e5 100644 --- 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 e7f8eb5520..4954bc0036 100644 --- a/src/frontends/qt2/ui/ClassModuleBase.ui +++ b/src/frontends/qt2/ui/ClassModuleBase.ui @@ -38,7 +38,7 @@ text - Document &class : + Document &class: buddy @@ -74,7 +74,7 @@ text - Op&tions : + Op&tions: buddy @@ -103,7 +103,7 @@ text - Page &style : + Page &style: buddy @@ -252,7 +252,7 @@ text - &Font && size : + &Font && size: buddy @@ -267,7 +267,7 @@ text - &Line spacing : + &Line spacing: buddy diff --git a/src/frontends/qt2/ui/LanguageModuleBase.ui b/src/frontends/qt2/ui/LanguageModuleBase.ui index 85b830a4a5..932801b73f 100644 --- a/src/frontends/qt2/ui/LanguageModuleBase.ui +++ b/src/frontends/qt2/ui/LanguageModuleBase.ui @@ -38,7 +38,7 @@ title - Quote style + Quote Style exclusive diff --git a/src/frontends/qt2/ui/NumberingModuleBase.ui b/src/frontends/qt2/ui/NumberingModuleBase.ui index 13906a6468..5c06ac6998 100644 --- a/src/frontends/qt2/ui/NumberingModuleBase.ui +++ b/src/frontends/qt2/ui/NumberingModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 216 + 234 105 @@ -42,7 +42,7 @@ title - Numbering depth + Numbering Depth @@ -61,7 +61,7 @@ text - &Section : + &Section: buddy @@ -76,7 +76,7 @@ text - &Table of contents : + &Table of contents: buddy diff --git a/src/frontends/qt2/ui/PackagesModuleBase.ui b/src/frontends/qt2/ui/PackagesModuleBase.ui index 2c92a38b81..6bbeec9da1 100644 --- a/src/frontends/qt2/ui/PackagesModuleBase.ui +++ b/src/frontends/qt2/ui/PackagesModuleBase.ui @@ -89,7 +89,7 @@ text - Postscript &driver : + Postscript &driver: buddy diff --git a/src/frontends/qt2/ui/PaperModuleBase.ui b/src/frontends/qt2/ui/PaperModuleBase.ui index ec01f7718c..9f803f307c 100644 --- a/src/frontends/qt2/ui/PaperModuleBase.ui +++ b/src/frontends/qt2/ui/PaperModuleBase.ui @@ -13,7 +13,7 @@ 0 0 - 235 + 231 269 @@ -81,7 +81,7 @@ title - Paper size + Paper Size orientation diff --git a/src/frontends/qt2/ui/QCharacterDialogBase.ui b/src/frontends/qt2/ui/QCharacterDialogBase.ui index 354aedd1fd..1a2a70fb0e 100644 --- a/src/frontends/qt2/ui/QCharacterDialogBase.ui +++ b/src/frontends/qt2/ui/QCharacterDialogBase.ui @@ -13,8 +13,8 @@ 0 0 - 368 - 256 + 449 + 368 @@ -61,10 +61,6 @@ name charGB - - title - Character - sizePolicy @@ -72,6 +68,10 @@ 5 + + title + Character + layoutMargin @@ -299,7 +299,7 @@ title - Never toggled + Never Toggled layoutMargin @@ -353,7 +353,7 @@ title - Always toggled + Always Toggled layoutMargin diff --git a/src/frontends/qt2/ui/QERTDialogBase.ui b/src/frontends/qt2/ui/QERTDialogBase.ui index 3cc895c701..2f23ab6258 100644 --- a/src/frontends/qt2/ui/QERTDialogBase.ui +++ b/src/frontends/qt2/ui/QERTDialogBase.ui @@ -42,7 +42,7 @@ title - ERT inset display + Display diff --git a/src/frontends/qt2/ui/QFloatDialogBase.ui b/src/frontends/qt2/ui/QFloatDialogBase.ui index 9734ca4956..5afbfb90b2 100644 --- a/src/frontends/qt2/ui/QFloatDialogBase.ui +++ b/src/frontends/qt2/ui/QFloatDialogBase.ui @@ -13,7 +13,7 @@ 0 0 - 369 + 381 259 @@ -57,7 +57,7 @@ title - Advanced placement options + Advanced Placement Options diff --git a/src/frontends/qt2/ui/QGraphicsDialogBase.ui b/src/frontends/qt2/ui/QGraphicsDialogBase.ui index 77bb7f563f..fb90eed019 100644 --- a/src/frontends/qt2/ui/QGraphicsDialogBase.ui +++ b/src/frontends/qt2/ui/QGraphicsDialogBase.ui @@ -13,8 +13,8 @@ 0 0 - 379 - 390 + 464 + 492 @@ -116,7 +116,7 @@ text - &Browse ... + &Browse... toolTip @@ -133,7 +133,7 @@ title - LyX display + LyX Display @@ -167,7 +167,7 @@ text - Display : + Display: buddy @@ -221,7 +221,7 @@ text - Scale : + Scale: buddy @@ -1022,7 +1022,7 @@ text - Ca&ption : + Ca&ption: buddy diff --git a/src/frontends/qt2/ui/QParagraphDialogBase.ui b/src/frontends/qt2/ui/QParagraphDialogBase.ui index 6f52fbc0a0..0ba4d3c837 100644 --- a/src/frontends/qt2/ui/QParagraphDialogBase.ui +++ b/src/frontends/qt2/ui/QParagraphDialogBase.ui @@ -13,7 +13,7 @@ 0 0 - 399 + 395 292 @@ -604,7 +604,7 @@ title - &Page breaks + &Page Breaks diff --git a/src/frontends/qt2/ui/QPreambleDialogBase.ui b/src/frontends/qt2/ui/QPreambleDialogBase.ui index cb83d32324..cf4b4bfdf4 100644 --- a/src/frontends/qt2/ui/QPreambleDialogBase.ui +++ b/src/frontends/qt2/ui/QPreambleDialogBase.ui @@ -68,7 +68,7 @@ text - &Edit ... + &Edit... default diff --git a/src/frontends/qt2/ui/QPrefColorsModule.ui b/src/frontends/qt2/ui/QPrefColorsModule.ui index 78498b8b97..a550d3217c 100644 --- a/src/frontends/qt2/ui/QPrefColorsModule.ui +++ b/src/frontends/qt2/ui/QPrefColorsModule.ui @@ -90,7 +90,7 @@ text - &Alter ... + &Alter... diff --git a/src/frontends/qt2/ui/QPrefLatexModule.ui b/src/frontends/qt2/ui/QPrefLatexModule.ui index 3e3ab00aa8..64134a2e7e 100644 --- a/src/frontends/qt2/ui/QPrefLatexModule.ui +++ b/src/frontends/qt2/ui/QPrefLatexModule.ui @@ -13,7 +13,7 @@ 0 0 - 343 + 376 237 @@ -200,7 +200,7 @@ title - External applications + External Applications @@ -219,7 +219,7 @@ text - Chec&kTeX command : + Chec&kTeX command: buddy diff --git a/src/frontends/qt2/ui/QPrefPathsModule.ui b/src/frontends/qt2/ui/QPrefPathsModule.ui index 2f727fd76b..19c26fe4b5 100644 --- a/src/frontends/qt2/ui/QPrefPathsModule.ui +++ b/src/frontends/qt2/ui/QPrefPathsModule.ui @@ -104,7 +104,7 @@ text - &Backup directory : + &Backup directory: buddy @@ -119,7 +119,7 @@ text - &Document templates : + &Document templates: buddy @@ -134,7 +134,7 @@ text - Ly&XServer pipe : + Ly&XServer pipe: buddy @@ -197,7 +197,7 @@ text - &Working directory : + &Working directory: buddy diff --git a/src/frontends/qt2/ui/QPrefPrinterModule.ui b/src/frontends/qt2/ui/QPrefPrinterModule.ui index 3253fb1ae1..b77e0d4096 100644 --- a/src/frontends/qt2/ui/QPrefPrinterModule.ui +++ b/src/frontends/qt2/ui/QPrefPrinterModule.ui @@ -13,8 +13,8 @@ 0 0 - 385 - 384 + 433 + 485 @@ -68,7 +68,7 @@ text - Printer &name : + Printer &name: buddy @@ -156,7 +156,7 @@ title - Command options + Command Options diff --git a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui index 7fd2edd6e4..a2b7a77aa9 100644 --- a/src/frontends/qt2/ui/QPrefScreenFontsModule.ui +++ b/src/frontends/qt2/ui/QPrefScreenFontsModule.ui @@ -13,8 +13,8 @@ 0 0 - 321 - 344 + 346 + 441 @@ -107,7 +107,7 @@ text - Sa&ns Serif : + Sa&ns Serif: buddy @@ -154,7 +154,7 @@ text - T&ypewriter : + T&ypewriter: buddy @@ -169,7 +169,7 @@ text - &Roman : + &Roman: buddy @@ -320,7 +320,7 @@ title - Font sizes + Font Sizes diff --git a/src/frontends/qt2/ui/QPrefUIModule.ui b/src/frontends/qt2/ui/QPrefUIModule.ui index 9da3cc4253..9403de11ec 100644 --- a/src/frontends/qt2/ui/QPrefUIModule.ui +++ b/src/frontends/qt2/ui/QPrefUIModule.ui @@ -13,8 +13,8 @@ 0 0 - 436 - 213 + 477 + 341 @@ -170,7 +170,7 @@ text - W&heel mouse scroll : + W&heel mouse scroll: buddy @@ -335,7 +335,7 @@ text - &Maximum last files : + &Maximum last files: buddy diff --git a/src/frontends/qt2/ui/QPrintDialogBase.ui b/src/frontends/qt2/ui/QPrintDialogBase.ui index 458a84d8f5..cae3fbb5af 100644 --- a/src/frontends/qt2/ui/QPrintDialogBase.ui +++ b/src/frontends/qt2/ui/QPrintDialogBase.ui @@ -458,7 +458,7 @@ text - &Browse ... + &Browse... diff --git a/src/frontends/qt2/ui/QSearchDialogBase.ui b/src/frontends/qt2/ui/QSearchDialogBase.ui index 0190d39752..c966f8031c 100644 --- a/src/frontends/qt2/ui/QSearchDialogBase.ui +++ b/src/frontends/qt2/ui/QSearchDialogBase.ui @@ -281,7 +281,7 @@ text - Replace &All + Replace &All diff --git a/src/frontends/qt2/ui/QShowFileDialogBase.ui b/src/frontends/qt2/ui/QShowFileDialogBase.ui index 3144f195a4..20d68fff98 100644 --- a/src/frontends/qt2/ui/QShowFileDialogBase.ui +++ b/src/frontends/qt2/ui/QShowFileDialogBase.ui @@ -19,7 +19,7 @@ caption - File: + File: sizeGripEnabled diff --git a/src/frontends/qt2/ui/QTabularDialogBase.ui b/src/frontends/qt2/ui/QTabularDialogBase.ui index 3ef939529d..f498df48ec 100644 --- a/src/frontends/qt2/ui/QTabularDialogBase.ui +++ b/src/frontends/qt2/ui/QTabularDialogBase.ui @@ -1234,7 +1234,7 @@ text - Current cell : + Current cell: diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 3fa0217898..4e7132126a 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,10 @@ +2003-01-20 Michael Schmitt + + * 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 * 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 7dbe15dc34..566e03265f 100644 --- 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 ¶ms) 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 a1126366b7..31d7283442 100644 --- 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 4425d27ba6..c0f0c7af21 100644 --- 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 2950b54e3b..54de2d0c38 100644 --- 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 f37d24fa18..90a82c2b59 100644 --- 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 3e8db0d796..7eeda5193a 100644 --- 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 5ef20c9bdf..f63805540a 100644 --- 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 81518fe88b..efad37bfe1 100644 --- 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 769b29a900..21ce9f933a 100644 --- 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 235b14f3d5..b14138b81e 100644 --- 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 eb2c170bda..0e08ad6790 100644 --- 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 7886431d2b..32af45e742 100644 --- 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 3a1730b4d2..61c9649254 100644 --- 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 1291e8e3a7..67c6b5a5bb 100644 --- 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 4629969893..deb84f83a1 100644 --- 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 4a1c7c084d..a0d178198d 100644 --- 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 2e0532e7e3..47126c293b 100644 --- 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 a8dbe4d8d6..55d9b5f287 100644 --- 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 d93f739f05..a6ea906ed6 100644 --- 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 88f11501f8..86b3e27431 100644 --- 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 f8c8422018..9df1ee800d 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,10 @@ +2003-01-20 Michael Schmitt + + * insetert.C: + * insetgraphics.C: + * insettabular.C: + * insettext.C: Use error messages with identical spelling and punctuation + 2003-01-12 Michael Schmitt * insetgraphics.C (draw, width): Fix spacing around graphics inset diff --git a/src/insets/insetert.C b/src/insets/insetert.C index 57ef983965..58a796d02a 100644 --- 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 3e075742e8..59ff3d4e2e 100644 --- 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 fbe8c938e1..61cc2ea0bb 100644 --- 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 6bca675ce8..0e39dbc75e 100644 --- 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 757487b531..56a059d7ff 100644 --- 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 0b0e0802ac..eb8bac0e89 100644 --- 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 401b148acc..a9e07de78e 100644 --- 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 2f9023a3cd..df11e09024 100644 --- 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; -- 2.39.2