replace "Listings" by "Listing" (plural => singular)

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

diff --git a/src/frontends/qt4/QInclude.cpp b/src/frontends/qt4/QInclude.cpp
index 64dbb480913af8ff99b7d9219136bb40e0c4158d..d5d3ea430abf79b3262d0d9554644a2c24eccc00 100644 (file)
--- 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(
                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) {
                        okPB->setEnabled(true);
                }
        } catch (invalidParam & e) {


@@ -208,7 +208,7 @@ void QInclude::update_contents()
        dialog_->labelLE->clear();
        dialog_->listingsED->clear();
        dialog_->listingsTB->setPlainText(
        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" &&
 
        string cmdname = controller().params().getCmdName();
        if (cmdname != "include" &&

diff --git a/src/frontends/qt4/QListings.cpp b/src/frontends/qt4/QListings.cpp
index 3b360962640b889198d30b5a7792d9a073fe54aa..6cfc5625f36faf68c636eceac257c397c9ed394d 100644 (file)
--- 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(
                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);
                }
                        okPB->setEnabled(true);
                        applyPB->setEnabled(true);
                }


@@ -394,7 +394,7 @@ void QListingsDialog::on_languageCO_currentIndexChanged(int index)
 typedef QController<ControlListings, QView<QListingsDialog> > listings_wrap_base_class;
 
 QListings::QListings(Dialog & parent)
 typedef QController<ControlListings, QView<QListingsDialog> > 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(
        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();
 }
 
        update_contents();
 }


@@ -439,7 +439,7 @@ void QListings::update_contents()
 {
        // set default values
        dialog_->listingsTB->setPlainText(
 {
        // 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);
        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 2963687612f6b1e53d4c8d59709de28c1df44d2f..9190b2c0ecfbae050aaaaab17fdbde6d17dbb366 100644 (file)
--- a/src/frontends/qt4/ui/IncludeUi.ui
+++ b/src/frontends/qt4/ui/IncludeUi.ui
@@ -289,7 +289,7 @@
      </item>
      <item>
       <property name="text" >
      </item>
      <item>
       <property name="text" >

-       <string>Listings</string>
+       <string>Listing</string>

       </property>
      </item>
     </widget>
       </property>
      </item>
     </widget>

diff --git a/src/frontends/qt4/ui/ListingsUi.ui b/src/frontends/qt4/ui/ListingsUi.ui
index b341d871a786203310dc062d0f8a656720fe2dea..bfef50f07988d1ae023fca53c930aef130890de2 100644 (file)
--- a/src/frontends/qt4/ui/ListingsUi.ui
+++ b/src/frontends/qt4/ui/ListingsUi.ui
@@ -536,7 +536,7 @@
           <item row="0" column="1" >
            <widget class="QTextEdit" name="listingsED" >
             <property name="toolTip" >
           <item row="0" column="1" >
            <widget class="QTextEdit" name="listingsED" >
             <property name="toolTip" >

-             <string>Input listings parameters here. Enter ? for a list of parameters.</string>
+             <string>Input listing parameters here. Enter ? for a list of parameters.</string>

             </property>
            </widget>
           </item>
             </property>
            </widget>
           </item>

diff --git a/src/frontends/qt4/ui/TextLayoutUi.ui b/src/frontends/qt4/ui/TextLayoutUi.ui
index 9000fccfc8892a13ed68b96147b349816d332e15..83f0cbd45b4d2459ffdb927165c4481f008cbae2 100644 (file)
--- a/src/frontends/qt4/ui/TextLayoutUi.ui
+++ b/src/frontends/qt4/ui/TextLayoutUi.ui
@@ -220,7 +220,7 @@
       <enum>Qt::LeftToRight</enum>
      </property>
      <property name="title" >
       <enum>Qt::LeftToRight</enum>
      </property>
      <property name="title" >

-      <string>Listings settings</string>
+      <string>Listing settings</string>

      </property>
      <layout class="QVBoxLayout" >
       <property name="margin" >
      </property>
      <layout class="QVBoxLayout" >
       <property name="margin" >

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 60dc22eb64796424b845a12964b52ddf5723584d..cac92f8ce1d2a748ab92c2e69b4567aebec63799 100644 (file)
--- 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
 {
 
 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
 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 80eb0607bbe0266fe913ba31fc28a19bc90f7100..003fe876f076d04f6466e3716ca15e8e8502b193 100644 (file)
--- 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 "
        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 "
        // 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"] =
        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())
 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(
 
        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);
 
        // 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())
                }
        }
        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"),
                                                    from_utf8(name)));
        else
                throw invalidParam(bformat(_("Parameters starting with '%1$s': %2$s"),