From 78b71f98637c3a7419d082c6f3cfd91f1ecd258e Mon Sep 17 00:00:00 2001 From: Michael Schmitt Date: Tue, 29 May 2007 21:23:23 +0000 Subject: [PATCH] replace "Listings" by "Listing" (plural => singular) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18570 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/QInclude.cpp | 4 ++-- src/frontends/qt4/QListings.cpp | 8 ++++---- src/frontends/qt4/ui/IncludeUi.ui | 2 +- src/frontends/qt4/ui/ListingsUi.ui | 2 +- src/frontends/qt4/ui/TextLayoutUi.ui | 2 +- src/insets/InsetListings.cpp | 4 ++-- src/insets/InsetListingsParams.cpp | 10 +++++----- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/frontends/qt4/QInclude.cpp b/src/frontends/qt4/QInclude.cpp index 64dbb48091..d5d3ea430a 100644 --- a/src/frontends/qt4/QInclude.cpp +++ b/src/frontends/qt4/QInclude.cpp @@ -92,7 +92,7 @@ void QIncludeDialog::validate_listings_params() if (!isOK) { isOK = true; listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); okPB->setEnabled(true); } } catch (invalidParam & e) { @@ -208,7 +208,7 @@ void QInclude::update_contents() dialog_->labelLE->clear(); dialog_->listingsED->clear(); dialog_->listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); string cmdname = controller().params().getCmdName(); if (cmdname != "include" && diff --git a/src/frontends/qt4/QListings.cpp b/src/frontends/qt4/QListings.cpp index 3b36096264..6cfc5625f3 100644 --- a/src/frontends/qt4/QListings.cpp +++ b/src/frontends/qt4/QListings.cpp @@ -325,7 +325,7 @@ void QListingsDialog::validate_listings_params() if (!isOK) { isOK = true; listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); okPB->setEnabled(true); applyPB->setEnabled(true); } @@ -394,7 +394,7 @@ void QListingsDialog::on_languageCO_currentIndexChanged(int index) typedef QController > listings_wrap_base_class; QListings::QListings(Dialog & parent) - : listings_wrap_base_class(parent, _("Program Listings Settings")) + : listings_wrap_base_class(parent, _("Program Listing Settings")) { } @@ -407,7 +407,7 @@ void QListings::build_dialog() bcview().setApply(dialog_->applyPB); bcview().setCancel(dialog_->closePB); dialog_->listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); update_contents(); } @@ -439,7 +439,7 @@ void QListings::update_contents() { // set default values dialog_->listingsTB->setPlainText( - qt_("Input listings parameters on the right. Enter ? for a list of parameters.")); + qt_("Input listing parameters on the right. Enter ? for a list of parameters.")); dialog_->languageCO->setCurrentIndex(findToken(languages, "no language")); dialog_->dialectCO->setCurrentIndex(0); dialog_->floatCB->setChecked(false); diff --git a/src/frontends/qt4/ui/IncludeUi.ui b/src/frontends/qt4/ui/IncludeUi.ui index 2963687612..9190b2c0ec 100644 --- a/src/frontends/qt4/ui/IncludeUi.ui +++ b/src/frontends/qt4/ui/IncludeUi.ui @@ -289,7 +289,7 @@ - Listings + Listing diff --git a/src/frontends/qt4/ui/ListingsUi.ui b/src/frontends/qt4/ui/ListingsUi.ui index b341d871a7..bfef50f079 100644 --- a/src/frontends/qt4/ui/ListingsUi.ui +++ b/src/frontends/qt4/ui/ListingsUi.ui @@ -536,7 +536,7 @@ - Input listings parameters here. Enter ? for a list of parameters. + Input listing parameters here. Enter ? for a list of parameters. diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui index 9000fccfc8..83f0cbd45b 100644 --- a/src/frontends/qt4/ui/TextLayoutUi.ui +++ b/src/frontends/qt4/ui/TextLayoutUi.ui @@ -220,7 +220,7 @@ Qt::LeftToRight - Listings settings + Listing settings diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp index 60dc22eb64..cac92f8ce1 100644 --- a/src/insets/InsetListings.cpp +++ b/src/insets/InsetListings.cpp @@ -124,7 +124,7 @@ void InsetListings::read(Buffer const & buf, Lexer & lex) docstring const InsetListings::editMessage() const { - return _("Opened Listings Inset"); + return _("Opened Listing Inset"); } @@ -248,7 +248,7 @@ bool InsetListings::getStatus(Cursor & cur, FuncRequest const & cmd, void InsetListings::setButtonLabel() { // FIXME UNICODE - setLabel(isOpen() ? _("Listings") : getNewLabel(_("Listings"))); + setLabel(isOpen() ? _("Listing") : getNewLabel(_("Listing"))); } diff --git a/src/insets/InsetListingsParams.cpp b/src/insets/InsetListingsParams.cpp index 80eb0607bb..003fe876f0 100644 --- a/src/insets/InsetListingsParams.cpp +++ b/src/insets/InsetListingsParams.cpp @@ -418,12 +418,12 @@ ParValidator::ParValidator() all_params_["caption"] = ListingsParam("", false, ALL, "", _( "This parameter should not be entered here. Please use caption " - "editbox (Include dialog) or insert->caption (listings inset)")); + "editbox (Include dialog) or insert->caption (listing inset)")); // this option is not handled in the parameter box all_params_["label"] = ListingsParam("", false, ALL, "",_( "This parameter should not be entered here. Please use label " - "editbox (Include dialog) or insert->caption (listings inset)")); + "editbox (Include dialog) or insert->caption (listing inset)")); all_params_["nolol"] = ListingsParam("", false, TRUEFALSE, "", empty_hint); all_params_["captionpos"] = @@ -601,11 +601,11 @@ ListingsParam const & ParValidator::validate(string const & key, ListingsParam const & ParValidator::param(string const & name) const { if (name.empty()) - throw invalidParam(_("Invalid (empty) listings param name.")); + throw invalidParam(_("Invalid (empty) listing parameter name.")); if (name == "?") throw invalidParam(bformat( - _("Available listings parameters are %1$s"), from_ascii(all_param_names_))); + _("Available listing parameters are %1$s"), from_ascii(all_param_names_))); // locate name in parameter table ListingsParams::const_iterator it = all_params_.find(name); @@ -623,7 +623,7 @@ ListingsParam const & ParValidator::param(string const & name) const } } if (matching_names.empty()) - throw invalidParam(bformat(_("Unknown listings param name: %1$s"), + throw invalidParam(bformat(_("Unknown listing parameter name: %1$s"), from_utf8(name))); else throw invalidParam(bformat(_("Parameters starting with '%1$s': %2$s"), -- 2.39.5